Skip to content
Snippets Groups Projects
Commit 911006bd authored by Igor Witz's avatar Igor Witz
Browse files

Update .gitlab-ci.yml, pica-dokuwiki/Dockerfile files

parent 9f50dcc6
No related branches found
No related tags found
1 merge request!22Ajout de la CI pour Etherpad et Dokuwiki
Pipeline #31160 canceled
......@@ -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:
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment