From 71be6949687fef0dae231d42d1d3144a80f90d7f Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Mon, 9 Dec 2019 18:26:41 +0100
Subject: [PATCH] Change sed separator as image names may contain slash
---
.gitlab-ci.yml | 2 +-
pica-etherpad/Dockerfile | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99272cbc..2ba95521 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,7 +127,7 @@ docker-bench-security:
<<: *pull-modified-image
script:
# Change the Docker Compose to use the "testing" image, not yet pushed on production registry
- - sed -i -e "s/$MODIFIED_IMAGE_FULL/$REGISTRY\/ci-builds\/$MODIFIED_IMAGE:$CI_COMMIT_SHA/g" $MODIFIED_IMAGE/docker-compose.yml
+ - sed -i -e "s|$MODIFIED_IMAGE_FULL|$REGISTRY/ci-builds/$MODIFIED_IMAGE:$CI_COMMIT_SHA|g" $MODIFIED_IMAGE/docker-compose.yml
# If *.example secrets files exist, remove the .example extension to be able to start the container
# Indeed these file are used in Docker Compose with env_file directive
- if [[ -d $MODIFIED_IMAGE/secrets ]]; then for i in $MODIFIED_IMAGE/secrets/*.example ; do cp $i $(echo $i| cut -d '.' -f1,2); done; fi;
diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index bdf8c5cc..75146d51 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -49,6 +49,7 @@ RUN for PLUGIN_NAME in ${ETHERPAD_PLUGINS}; do npm install "${PLUGIN_NAME}"; don
# Construction de l'image finale
FROM base
+# Try to stick to the LDAP UID for etherpad (OU=services)
ARG UID=5004
COPY entrypoint.sh /opt/etherpad-lite/entrypoint.sh
--
GitLab