Browse Source

Changed to use docker-compose for squid

yhirose 6 years ago
parent
commit
079d3605ea

+ 1 - 1
test/test_proxy_docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM centos
+FROM centos:7
 LABEL maintainer="[email protected]"
 LABEL maintainer="[email protected]"
 ARG auth="basic"
 ARG auth="basic"
 ARG port="3128"
 ARG port="3128"

+ 22 - 0
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

+ 1 - 4
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

+ 1 - 5
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