Merge branch 'devops-284-update-ci-scripts' into 'master'

ci: image removal

See merge request !86

.gitlab-ci.yml

@@ -8,57 +8,55 @@ stages:
 - deploy
 
 variables:
-   DOCKER_CONFIG: ~/.docker/$CI_JOB_ID
+  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
+  MANIFEST:            $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
 
 before_script:
   - "[ -d $DOCKER_CONFIG ] || mkdir -p $DOCKER_CONFIG"
   - "echo '{ \"experimental\": \"enabled\" }' > $DOCKER_CONFIG/config.json"
   - 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:
-  variables:
-    IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
   stage: build
   tags:
     - ppc64le
   script:
-    - docker build --no-cache --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
-    - docker push $IMAGE
+    - docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN   --pull -t $IMAGE_ppc64le -f Dockerfile .
+    - docker push $IMAGE_ppc64le
 
 amd64:
   variables:
-    IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
   stage: build
   tags:
     - amd64
   script:
-    - docker build --no-cache --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
-    - docker push $IMAGE
+    - docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $IMAGE_amd64 -f Dockerfile .
+    - docker push $IMAGE_amd64
 
 manifest:
-  variables:
-    IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-    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
   stage: manifest
   tags:
     - amd64
   script:
-    - docker manifest create $IMAGE $IMAGE_amd64 $IMAGE_ppc64le 
-    - docker manifest push $IMAGE
- 
+    - docker manifest create   $MANIFEST $IMAGE_amd64 $IMAGE_ppc64le
+    - docker manifest annotate $MANIFEST $IMAGE_amd64   --os linux --arch amd64
+    - docker manifest annotate $MANIFEST $IMAGE_ppc64le --os linux --arch ppc64le
+    - docker manifest push     $MANIFEST
+
 deploy:
   stage: deploy
   tags:
-    - hv2
+    - ppc64le
   only:
-    - master 
+    - master
   script:
-    - apk add curl
-    - for ref in $DEPLOYENVS; do curl -X POST -F token=$TRIGGER_TOKEN -F ref=$ref -F variables[branch]=master https://code.vereign.com/api/v4/projects/59/trigger/pipeline; 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
 
-