From 212bdefa3b0b57285f9629f597f36f580ba55702 Mon Sep 17 00:00:00 2001 From: gianluca-mascolo Date: Sat, 3 Oct 2020 17:49:14 +0200 Subject: [PATCH 1/3] use squidclient for unit test --- docker-compose.test.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 7b48686..af6539b 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,11 +1,20 @@ version: '2' services: proxy: - build: . + image: squidproxy + build: + context: . + dockerfile: Dockerfile + healthcheck: + test: ["CMD", "sh", "-exc", "squidclient -T 3 mgr:info 2> /dev/null | grep -qF '200 OK'"] + interval: 5s + timeout: 3s + retries: 5 + start_period: 1s sut: - image: alpine:3.10.1 + image: squidproxy links: - proxy depends_on: - proxy - command: sh -exc "apk add --update curl && sleep 5 && exec curl --proxy http://proxy:3128 -I http://google.com/" + command: sh -exc "sleep 10 && squidclient -h proxy -T 3 'https://postman-echo.com/get?squidtest=ok' 2> /dev/null | grep -qF '200 OK'" From 6486bd001ca5ace8661f0344a03e3cd26a245c85 Mon Sep 17 00:00:00 2001 From: gianluca-mascolo Date: Sun, 4 Oct 2020 11:57:30 +0200 Subject: [PATCH 2/3] fix docker-compose version --- docker-compose.test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index af6539b..69bc18a 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,4 +1,4 @@ -version: '2' +version: '2.1' services: proxy: image: squidproxy From d01a447dcfab8585c8048aca648dbb029df0e754 Mon Sep 17 00:00:00 2001 From: gianluca-mascolo Date: Sun, 4 Oct 2020 16:18:04 +0200 Subject: [PATCH 3/3] changed docker-compose version to support start_period --- docker-compose.test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 69bc18a..e0f80f8 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,4 +1,4 @@ -version: '2.1' +version: '2.3' services: proxy: image: squidproxy