Add management for docker registry image

.gitlab-ci.yml

@@ -8,7 +8,10 @@ build_development:
     - master
   script:
     - export NODE_ENV=DEV
-    - docker-compose --project-name service-email-dev build
+    - export TAG=dev
+    - docker-compose build 
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker-compose push
 
 deploy_development:
   stage: deploy
@@ -16,22 +19,22 @@ deploy_development:
     - master
   script:
     - export NODE_ENV=DEV
-    - docker-compose --project-name service-email-dev up -d
-
-build_staging:
-  stage: build
-  only:
-    - staging
-  script:
-    - export NODE_ENV=REC
-    - sed -i 's/DEV_/REC_/g' docker-compose.yml
-    - docker-compose --project-name service-email-rec build
+    - export TAG=dev
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker-compose pull
+    - docker-compose --project-name service-email-${TAG} up -d
 
 deploy_staging:
   stage: deploy
   only:
-    - staging
+    - master
+  when: manual
   script:
+    - export TAG=staging
     - export NODE_ENV=REC
     - sed -i 's/DEV_/REC_/g' docker-compose.yml
-    - docker-compose --project-name service-email-rec up -d
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - TAG=dev docker-compose pull
+    - docker tag $CI_REGISTRY/refonte-data/service-email:dev $CI_REGISTRY/refonte-data/service-email:${TAG}
+    - docker push $CI_REGISTRY/refonte-data/service-email:${TAG}
+    - docker-compose --project-name service-email-${TAG} up -d

docker-compose.yml

@@ -2,8 +2,9 @@ version: '3.1'
 
 services:
   service-email:
+    container_name: service-email-${TAG}
     build: .
-    container_name: service-email-${NODE_ENV}
+    image: registry.alpha.grandlyon.com/refonte-data/service-email:${TAG}
     ports:
       - ${DEV_SERVICE_EMAIL_PORT}:3000
     environment:
@@ -14,9 +15,9 @@ services:
     restart: unless-stopped
   rabbitmq:
     image: 'rabbitmq:3-management-alpine'
-    container_name: rabbitmq-${NODE_ENV}
+    container_name: rabbitmq-${TAG}
     ports:
-      - ${DEV_RABBITMQ_STANDARD_PORT}:5672 # standar port for communication
+      - ${DEV_RABBITMQ_STANDARD_PORT}:5672 # standard port for communication
       - ${DEV_RABBITMQ_INTERFACE_PORT}:15672 # graphique interface
     environment:
       - RABBITMQ_DEFAULT_USER=${DEV_RABBITMQ_USER}