diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99272cbce3c43e2e667fd3abe72c27a7190e4e5b..2ba955216e7642f614253606493634df5e40625a 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 bdf8c5cc8e2e72ca52f4d9227fbf85f5c57a7a4c..75146d51e327a96aa4615fa01e9215efe3d57fee 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