Merge branch 'dev-ci' into 'master'

Changement de politique de redémarrage + réparation de la poussée sur le registre

See merge request !40

.gitlab-ci.yml

@@ -190,16 +190,17 @@ deployment-prod:
         - if [[ -d "$MODIFIED_IMAGE/secrets" ]]; then eval $(cat /etc/profile.d/ci-variables) ./decrypt-secrets.sh; fi
         - echo $REGISTRY_PASSWORD | docker login $REGISTRY -u $REGISTRY_USERNAME --password-stdin
         - docker pull $REGISTRY/ci-builds/$CI_COMMIT_SHA:latest
+        - docker logout $REGISTRY
         - docker tag $REGISTRY/ci-builds/$CI_COMMIT_SHA:latest  $MODIFIED_IMAGE_FULL
     script:
         - cd $MODIFIED_IMAGE
         - for SERVICE in $(docker-compose config --services); do if [[ $(docker container ls --format "{{.Names}}" | grep $SERVICE) ]]; then docker stop $SERVICE | xargs docker rm; fi; done
         - 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
+        - echo $REGISTRY_PROD_PASSWORD | docker login $REGISTRY_PROD -u $REGISTRY_PROD_USERNAME --password-stdin
         - docker push $REGISTRY_PROD/$MODIFIED_IMAGE_FULL
         - rm -rf $DOCKER_CERT_PATH
-        - docker logout $REGISTRY
+        - docker logout $REGISTRY_PROD
     tags: [build]
     only:
         changes:

pica-dokuwiki/docker-compose.yml

@@ -24,6 +24,6 @@ services:
           - "traefik.frontend.rule=Host:wiki.picasoft.net"
           - "traefik.port=80"
           - "traefik.enable=true"
-        restart: always
+        restart: unless-stopped
         networks:
           - docker_default

pica-etherpad/docker-compose.yml

@@ -31,7 +31,7 @@ services:
         environment:
           - ETHERPAD_THEME=colibris
           - ETHERPAD_MINIFY=true
-        restart: always
+        restart: unless-stopped
         networks:
           - docker_default
     etherpad-db:
@@ -45,6 +45,6 @@ services:
         volumes:
           - etherpad-db-volume:/var/lib/mysql
         env_file: ./secrets/etherpad-db.secrets
-        restart: always
+        restart: unless-stopped
         networks:
           - docker_default