From d77cb56ce8a6762c2b3182a20b0c50d2dac4b216 Mon Sep 17 00:00:00 2001
From: Igor Witz <igor.witz@etu.utc.fr>
Date: Wed, 29 May 2019 23:57:02 +0200
Subject: [PATCH] Update pica-etherpad/docker-compose.yml, .gitlab-ci.yml files
---
.gitlab-ci.yml | 3 ++-
pica-etherpad/docker-compose.yml | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b71d9caa..54028a7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,7 +93,8 @@ docker-bench-security:
- 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;
- - docker volume create $CONTAINER_NAME
+ # let docker-compose create the required volumes and networks
+ - sed -i -e 's/external: true/external: false/g' $MODIFIED_IMAGE/docker-compose.yml
script:
- cd $MODIFIED_IMAGE
- docker-compose up -d
diff --git a/pica-etherpad/docker-compose.yml b/pica-etherpad/docker-compose.yml
index 6e9a5303..b824e94a 100755
--- a/pica-etherpad/docker-compose.yml
+++ b/pica-etherpad/docker-compose.yml
@@ -2,8 +2,8 @@ version : "2.4"
volumes:
etherpad-db-volume:
- external:
- name: "etherpad-db"
+ external: true
+ name: "etherpad-db"
networks:
docker_default:
--
GitLab