ini

.gitlab-ci.yml

@@ -22,10 +22,10 @@ docker build:
     IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
   script:
     - echo "build stage"
-          #  - $REGISTRY_LOGIN $CI_REGISTRY
-          #- $IMAGE_BUILD --file $DOCKERFILE $BUILD_ARG --tag $IMAGE_NAME .
-          #- $IMAGE_PUSH $IMAGE_NAME $IMAGE_NAME
-      #  - $REGISTRY_LOGOUT $CI_REGISTRY
+    - $REGISTRY_LOGIN $CI_REGISTRY
+    - $IMAGE_BUILD --file $DOCKERFILE $BUILD_ARG --tag $IMAGE_NAME .
+    - $IMAGE_PUSH $IMAGE_NAME $IMAGE_NAME
+    - $REGISTRY_LOGOUT $CI_REGISTRY
 deploy:
   stage: deploy
   image: alpine/helm:latest
@@ -39,13 +39,12 @@ deploy:
     - DOMAIN=${RELEASE_NAME}.k.cirrus.cloud.inrae.fr
     - export HOST=$( eval echo \$DOMAIN )
     - echo "Host is $HOST"
-    - echo "Host is "
   script:
     - helm create rshiny
     - 'sed -ri "s/^(\s*)(containerPort\s*:\s*80\s*$)/\1containerPort: 3838/" rshiny/templates/deployment.yaml'
     - 'sed -ri "s/^(\s*)(targetPort\s*:\s*http\s*$)/\1targetPort: 3838/" rshiny/templates/service.yaml'
     - helm upgrade --namespace $NAMESPACE --install $RELEASE_NAME 
-        --set image.repository=rocker/shiny --set image.tag="3.6.1" 
+        --set image.repository=$CI_REGISTRY_IMAGE --set image.tag=$CI_COMMIT_SHORT_SHA
         --set ingress.enabled=true --set ingress.hosts[0].host=$HOST
         --set ingress.hosts[0].paths[0].path="/" 
         --set ingress.tls[0].secretName=$TLS_SECRET