Merge branch 'dev-ci' of gitlab.utc.fr:picasoft/projets/dockerfiles into dev-ci

.gitlab-ci.yml

@@ -137,7 +137,7 @@ deployment-test:
     script:        
         - cd $MODIFIED_IMAGE
         - sed -i -e  s/picasoft.net/test.picasoft.net/g docker-compose.yml
-        - if [[ $(docker container ls --format "{{.Names}}" | grep $CONTAINER_NAME) ]]; then docker stop $CONTAINER_NAME | xargs docker rm; fi
+        - docker-compose down --rmi all
         - docker-compose up -d --force-recreate --remove-orphans $CONTAINER_NAME
     after_script:
         - rm -rf $DOCKER_CERT_PATH
@@ -177,7 +177,7 @@ deployment-prod:
         - docker tag $REGISTRY/ci-builds/$CI_COMMIT_SHA:latest  $MODIFIED_IMAGE_FULL
     script:
         - cd $MODIFIED_IMAGE
-        - if [[ $(docker container ls --format "{{.Names}}" | grep $CONTAINER_NAME) ]]; then docker stop $CONTAINER_NAME | xargs docker rm; fi
+        - docker-compose down --rmi all
         - docker-compose up -d --force-recreate --remove-orphans $CONTAINER_NAME
     after_script:
         - docker tag $REGISTRY/ci-builds/$CI_COMMIT_SHA:latest $REGISTRY_PROD/$MODIFIED_IMAGE_FULL

pica-etherpad/docker-compose.yml

 version : "2.4"
+
+volumes:
+  etherpad-db-volume:
+    external: 
+        name: "etherpad-db"
+
+networks:
+  docker_default:
+    external: true
+
 services:
     etherpad-app:
         image: pica-etherpad:1.7.5
@@ -19,6 +29,8 @@ services:
           - ETHERPAD_THEME=colibris
           - ETHERPAD_MINIFY=true
         restart: always
+        networks:
+          - docker_default
 
     etherpad-db:
         image: mysql:5.7
@@ -29,7 +41,7 @@ services:
         cpus: "0.20"
         pids_limit: 1024
         volumes:
-          - /DATA/docker/etherpad/etherpad-db/data:/var/lib/mysql
+          - etherpad-db-volume:/var/lib/mysql
         env_file: ./secrets/etherpad-db.secrets
         healthcheck:
           test: "/usr/bin/mysql --user=root --password=$${MYSQL_ROOT_PASSWORD} --execute \"SHOW DATABASES;\""
@@ -37,4 +49,6 @@ services:
           timeout: 20s
           retries: 10
         restart: always
+        networks:
+          - docker_default