From 911006bd1b451c901822146bbbf67d436466bd60 Mon Sep 17 00:00:00 2001
From: Igor Witz <igor.witz@etu.utc.fr>
Date: Tue, 27 Nov 2018 19:45:24 +0100
Subject: [PATCH] Update .gitlab-ci.yml, pica-dokuwiki/Dockerfile files
---
.gitlab-ci.yml | 2 +-
pica-dokuwiki/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 370579c2..0635f7cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ clair:
- wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
- mv clair-scanner_linux_amd64 clair-scanner
- chmod +x clair-scanner
- - echo "Waiting for Clair daemon to start"
+ - echo "Waiting for Clair daemon to start"wget
- while( ! wget -q -O /dev/null http://docker:6060/v1/namespaces ) ; do sleep 1 ; done
- ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r clair-report.json -l clair.log -w $MODIFIED_IMAGE/clair-whitelist.yml --threshold="High" $REGISTRY/ci-builds/$CI_COMMIT_SHA
artifacts:
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index 631ece8d..62c5d36b 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -30,7 +30,7 @@ RUN apt-get update -y && \
USER nginx
EXPOSE 80
VOLUME ["/var/www/html"]
-HEALTHCHECK CMD curl -s 127.0.0.1:${DOKUWIKI_PORT:=80}
+HEALTHCHECK CMD wget -q -O /dev/null http://127.0.0.1:${DOKUWIKI_PORT:=80}/
COPY nginx.conf /etc/nginx/nginx.conf
--
GitLab