Merge remote-tracking branch 'origin/master' into 12-refactor-ema-error-handling

.gitlab-ci.yml

@@ -8,6 +8,7 @@ stages:
 - deploy
 
 variables:
+  DOCKER_TLS_CERTDIR: "/certs"
   DOCKER_CONFIG: ~/.docker/$CI_JOB_ID
   IMAGE_amd64:         $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/amd64:$CI_COMMIT_REF_NAME
   IMAGE_ppc64le:       $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
@@ -19,6 +20,7 @@ before_script:
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
 after_script:
+  - "docker rmi $MANIFEST $IMAGE_amd64 $IMAGE_ppc64le ||  true"
   - "rm -vRf $DOCKER_CONFIG"
 
 ppc64le:
@@ -48,14 +50,12 @@ manifest:
     - docker manifest annotate $MANIFEST $IMAGE_ppc64le --os linux --arch ppc64le
     - docker manifest push     $MANIFEST
 
-
 deploy:
   stage: deploy
   tags:
-    - hv2
+    - ppc64le
   only:
     - master
   script:
-    - apk add curl
-    - for ref in $DEPLOYENVS; do curl -X POST -F token=$TRIGGER_TOKEN     -F ref=$ref -F variables[branch]=$CI_COMMIT_REF_NAME $TRIGGER_CODE_BUILD; done
+    - for ref in $DEPLOYENVS; do curl -X POST -F token=$TRIGGER_TOKEN -F ref=$ref -F variables[branch]=$CI_COMMIT_REF_NAME $TRIGGER_CODE_BUILD; done