From 75d42ffa1d00d24d3727dbd73f4b0df19f7044d7 Mon Sep 17 00:00:00 2001
From: Igor Witz <igor.witz@etu.utc.fr>
Date: Thu, 30 May 2019 17:48:44 +0200
Subject: [PATCH] Update .gitlab-ci.yml, pica-etherpad/clair-whitelist.yml
files
---
.gitlab-ci.yml | 4 ++--
pica-etherpad/clair-whitelist.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ff83b8e..a0791cb7 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
- - docker-compose down
+ - for SERVICE in $(docker-compose config --services); do if [[ $(docker container ls --format "{{.Names}}" | grep $SERVICE) ]]; then docker stop $SERVICE | xargs docker rm; fi
- 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
- - docker-compose down
+ - for SERVICE in $(docker-compose config --services); do if [[ $(docker container ls --format "{{.Names}}" | grep $SERVICE) ]]; then docker stop $SERVICE | xargs docker rm; fi
- 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 5dbddc20..30bfc60f 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
--
GitLab