Merge branch 'master' of gitlab.utc.fr:picasoft/projets/dockerfiles [skip ci]

.gitlab-ci.yml

@@ -120,6 +120,7 @@ clair:
 # Run docker-bench-security and upload the results
 docker-bench-security:
   stage: security-tests
+  tags: [build]
   script:
     # Change the Docker Compose to use the "testing" image, not yet pushed on production registry
     - sed -i -e "s|$MODIFIED_IMAGE_FULL|$MODIFIED_IMAGE_FULL_TEST|g" $MODIFIED_IMAGE/docker-compose.yml

docker_test.sh

@@ -50,7 +50,8 @@ fi
 
 echo -e "\n==== Remove and re-create named external volumes ===="
 for v in $(docker-compose config --volumes); do
-  docker volume rm "$v"
+  # Don't fail if volume does not exists
+  docker volume rm "$v" || true
   docker volume create "$v"
 done
 

pica-dokuwiki/Dockerfile

@@ -22,7 +22,8 @@ RUN apt-get update -y && \
     sed -i -e "s|;listen\.group\s*=\s*|listen.group = |g" /etc/php/7.3/fpm/pool.d/www.conf && \
     sed -i -e "s|;listen\.mode\s*=\s*|listen.mode = |g" /etc/php/7.3/fpm/pool.d/www.conf && \
     wget -O dokuwiki.tgz "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
-    tar -xzf dokuwiki.tgz -C html --strip-components 1 && \
+    mkdir update && \
+    tar -xzf dokuwiki.tgz -C update --strip-components 1 && \
     rm -f dokuwiki.tgz && \
     chown -R www-data . && \
     chmod +x /run.sh && \