Make dev-ci trigger push to registry

.gitlab-ci.yml

@@ -115,11 +115,9 @@ clair:
       - "pica-etherpad/*"
       - "pica-oh-my-form/*"
       - "pica-wekan/*"
-      - "pica-sympa/*"
     refs:
       - master
       - dev-ci
-      - dev-sympa
 
 # Run docker-bench-security and upload the results
 docker-bench-security:
@@ -150,11 +148,9 @@ docker-bench-security:
       - "pica-etherpad/*"
       - "pica-oh-my-form/*"
       - "pica-wekan/*"
-      - "pica-sympa/*"
     refs:
       - master
       - dev-ci
-      - dev-sympa
 
 # Push the generated image on the production registry,
 # once it passed all security tests and has been successfully built
@@ -176,3 +172,4 @@ push-prod:
       - "pica-oh-my-form/*"
     refs:
       - master
+      - dev-ci

pica-etherpad/docker-compose.yml

@@ -11,44 +11,44 @@ networks:
     name: "docker_default"
 
 services:
-    etherpad-app:
-        image: registry.picasoft.net/pica-etherpad:1.8.0
-        container_name: etherpad-app
-        depends_on:
-          - etherpad-db
-        links:
-          - etherpad-db:etherpad-db
-        security_opt:
-          - no-new-privileges
-        mem_limit: "2048m"
-        cpus: "0.60"
-        pids_limit: 1024
-        env_file: ./secrets/etherpad-app.secrets
-        volumes:
-          - ./settings.json:/opt/etherpad-lite/settings.json
-        labels:
-          traefik.frontend.rule: "Host:pad.picasoft.net"
-          traefik.port: 8080
-        environment:
-          ETHERPAD_THEME: "colibris"
-          ETHERPAD_MINIFY: "TRUE"
-          ETHERPAD_DB_HOST: "etherpad-db"
-          ETHERPAD_LOGLEVEL: "INFO"
-        restart: unless-stopped
-        networks:
-          - docker_default
+  etherpad-app:
+    image: registry.picasoft.net/pica-etherpad:1.8.0
+    container_name: etherpad-app
+    depends_on:
+      - etherpad-db
+    links:
+      - etherpad-db:etherpad-db
+    security_opt:
+      - no-new-privileges
+    mem_limit: "2048m"
+    cpus: 0.6
+    pids_limit: 1024
+    env_file: ./secrets/etherpad-app.secrets
+    volumes:
+      - ./settings.json:/opt/etherpad-lite/settings.json
+    labels:
+      traefik.frontend.rule: "Host:pad.picasoft.net"
+      traefik.port: 8080
+    environment:
+      ETHERPAD_THEME: "colibris"
+      ETHERPAD_MINIFY: "TRUE"
+      ETHERPAD_DB_HOST: "etherpad-db"
+      ETHERPAD_LOGLEVEL: "INFO"
+    restart: unless-stopped
+    networks:
+      - docker_default
 
-    etherpad-db:
-        image: mysql:5.7
-        container_name: etherpad-db
-        security_opt:
-          - no-new-privileges
-        mem_limit: "2048m"
-        cpus: "0.20"
-        pids_limit: 1024
-        volumes:
-          - etherpad-db-volume:/var/lib/mysql
-        env_file: ./secrets/etherpad-db.secrets
-        restart: unless-stopped
-        networks:
-          - docker_default
+  etherpad-db:
+    image: mysql:5.7
+    container_name: etherpad-db
+    security_opt:
+      - no-new-privileges
+    mem_limit: "2048m"
+    cpus: "0.20"
+    pids_limit: 1024
+    volumes:
+      - etherpad-db-volume:/var/lib/mysql
+    env_file: ./secrets/etherpad-db.secrets
+    restart: unless-stopped
+    networks:
+      - docker_default