diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 757886ed3c717a5d5965d961875e64e09c2168e7..1ed7a2f216a0b33512e459221b3a7dfa8c10eec1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,7 +137,7 @@ deployment-test: script: - cd $MODIFIED_IMAGE - sed -i -e s/picasoft.net/test.picasoft.net/g docker-compose.yml - - for SERVICE in $(docker-compose config --services); do if [[ $(docker container ls --format "{{.Names}}" | grep $SERVICE) ]]; then docker stop $SERVICE | xargs docker rm; fi + - for SERVICE in $(docker-compose config --services); do if [[ $(docker container ls --format "{{.Names}}" | grep $SERVICE) ]]; then docker stop $SERVICE | xargs docker rm; fi; done - docker-compose up -d --force-recreate --remove-orphans $CONTAINER_NAME after_script: - rm -rf $DOCKER_CERT_PATH @@ -177,7 +177,7 @@ deployment-prod: - docker tag $REGISTRY/ci-builds/$CI_COMMIT_SHA:latest $MODIFIED_IMAGE_FULL script: - cd $MODIFIED_IMAGE - - for SERVICE in $(docker-compose config --services); do if [[ $(docker container ls --format "{{.Names}}" | grep $SERVICE) ]]; then docker stop $SERVICE | xargs docker rm; fi + - for SERVICE in $(docker-compose config --services); do if [[ $(docker container ls --format "{{.Names}}" | grep $SERVICE) ]]; then docker stop $SERVICE | xargs docker rm; fi; done - docker-compose up -d --force-recreate --remove-orphans $CONTAINER_NAME after_script: - docker tag $REGISTRY/ci-builds/$CI_COMMIT_SHA:latest $REGISTRY_PROD/$MODIFIED_IMAGE_FULL diff --git a/pica-etherpad/clair-whitelist.yml b/pica-etherpad/clair-whitelist.yml index 30bfc60f45c4b0383eb3dd6841e5edbd04c5f196..5dbddc2009c856f6b8c914e2e4b960bb39c5de86 100644 --- a/pica-etherpad/clair-whitelist.yml +++ b/pica-etherpad/clair-whitelist.yml @@ -8,4 +8,4 @@ generalwhitelist: CVE-2019-9169: glibc -> Pas de contre mesure CVE-2017-12424: shadow -> Pas de contre mesure CVE-2019-11068: libxslt -> dépendance d'autres paquets, pas de correctif disponible -> Pas de contre-mesure - CVE-2019-9631: poppler -> à désinstaller \ No newline at end of file + CVE-2019-9631: poppler -> à désinstaller \ No newline at end of file