From 5d4f6d3a9568307fe046b10ac98a39e93e260388 Mon Sep 17 00:00:00 2001
From: Igor Witz <igor.witz@etu.utc.fr>
Date: Thu, 30 May 2019 17:08:26 +0200
Subject: [PATCH] Update .gitlab-ci.yml, pica-etherpad/docker-compose.yml files
---
.gitlab-ci.yml | 2 --
pica-etherpad/docker-compose.yml | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bef39bc..9ff83b8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,8 +89,6 @@ docker-bench-security:
- docker logout $REGISTRY
- source /etc/profile.d/ci-variables
- sed -i -e "s/$MODIFIED_IMAGE_FULL/$REGISTRY\/ci-builds\/$CI_COMMIT_SHA:latest/g" $MODIFIED_IMAGE/docker-compose.yml
- # remove links to external networks to be able to start the container locally
- - sed -i -e '/networks/,+3d' $MODIFIED_IMAGE/docker-compose.yml
# if secrets.example files exist, remove the .example extension to be able to start the container
- 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
diff --git a/pica-etherpad/docker-compose.yml b/pica-etherpad/docker-compose.yml
index b824e94a..3f91b74a 100755
--- a/pica-etherpad/docker-compose.yml
+++ b/pica-etherpad/docker-compose.yml
@@ -51,5 +51,4 @@ services:
retries: 10
restart: always
networks:
- - docker_default
-
+ - docker_default
\ No newline at end of file
--
GitLab