diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96bb0440f7e3bbd00da1a835df91f983792cb256..1bef39bc2a2e83798b903dc905a713acfc823e46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ services: stages: - metabuild - build - - static_tests - dynamic_tests + - static_tests - deployment # build the container that further steps will run in in order to avoid duplicating instructions between steps @@ -95,6 +95,7 @@ docker-bench-security: - if [[ -d $MODIFIED_IMAGE/secrets ]]; then for i in $MODIFIED_IMAGE/secrets/*.example ; do cp $i $(echo $i| cut -d '.' -f1,2); done; fi; # let docker-compose create the required volumes and networks - "sed -i -e 's/external: true/external: false/g' $MODIFIED_IMAGE/docker-compose.yml" + - cat $MODIFIED_IMAGE/docker-compose.yml script: - cd $MODIFIED_IMAGE - docker-compose up -d 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