From 9b5666445e0c0229b5cd630d279323d939352601 Mon Sep 17 00:00:00 2001
From: Igor Witz <igor.witz@etu.utc.fr>
Date: Thu, 30 May 2019 16:40:58 +0200
Subject: [PATCH] Update .gitlab-ci.yml, pica-etherpad/clair-whitelist.yml
files
---
.gitlab-ci.yml | 3 ++-
pica-etherpad/clair-whitelist.yml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96bb0440..1bef39bc 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 30bfc60f..5dbddc20 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