From 079d3605ea9c1bdb469ded866e3e03863a6d5019 Mon Sep 17 00:00:00 2001
From: yhirose <yuji.hirose.bug@gmail.com>
Date: Sun, 22 Dec 2019 19:09:01 -0500
Subject: [PATCH] Changed to use docker-compose for squid

---
 test/test_proxy_docker/Dockerfile         |  2 +-
 test/test_proxy_docker/docker-compose.yml | 22 ++++++++++++++++++++++
 test/test_proxy_docker/down.sh            |  5 +----
 test/test_proxy_docker/up.sh              |  6 +-----
 4 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 test/test_proxy_docker/docker-compose.yml

diff --git a/test/test_proxy_docker/Dockerfile b/test/test_proxy_docker/Dockerfile
index 781cb52..4974d00 100644
--- a/test/test_proxy_docker/Dockerfile
+++ b/test/test_proxy_docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos
+FROM centos:7
 LABEL maintainer="yuji.hirose.bug@gmail.com"
 ARG auth="basic"
 ARG port="3128"
diff --git a/test/test_proxy_docker/docker-compose.yml b/test/test_proxy_docker/docker-compose.yml
new file mode 100644
index 0000000..67a9e9b
--- /dev/null
+++ b/test/test_proxy_docker/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '2'
+
+services:
+  squid_basic:
+    image: squid_basic
+    restart: always
+    ports:
+      - "3128:3128"
+    build:
+      context: ./
+      args:
+        auth: basic
+
+  squid_digest:
+    image: squid_digest
+    restart: always
+    ports:
+      - "3129:3129"
+    build:
+      context: ./
+      args:
+        auth: digest
diff --git a/test/test_proxy_docker/down.sh b/test/test_proxy_docker/down.sh
index ccd42ad..6e0b3ee 100755
--- a/test/test_proxy_docker/down.sh
+++ b/test/test_proxy_docker/down.sh
@@ -1,4 +1 @@
-docker stop squid_basic
-docker rmi squid_basic
-docker stop squid_digest
-docker rmi squid_digest
+docker-compose down --rmi all
diff --git a/test/test_proxy_docker/up.sh b/test/test_proxy_docker/up.sh
index 3dca675..a8341a6 100755
--- a/test/test_proxy_docker/up.sh
+++ b/test/test_proxy_docker/up.sh
@@ -1,5 +1 @@
-docker build -t squid_basic --build-arg auth=basic .
-docker run -dt --name squid_basic -p 3128:3128 --rm squid_basic
-
-docker build -t squid_digest --build-arg auth=digest .
-docker run -dt --name squid_digest -p 3129:3129 --rm squid_digest
+docker-compose up -d