From ab7c42c4d03e1c6b2d1b6f1d9882b70434d2acdc Mon Sep 17 00:00:00 2001
From: Nuwan Rajika Kumarasiri <nuwan.kumarasiri@wisc.edu>
Date: Thu, 6 Feb 2020 12:36:24 -0600
Subject: [PATCH] Tag Secure Agent images for each build
Tag has the format `git-${CI_COMMIT_SHA:0:8}`. `CI_COMMIT_SHA` is the GitLab CI/CD variable for this commit has.
---
.gitlab-ci.yml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffb484c..c6f910b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,15 @@ stages:
- build
before_script:
+ - IMAGE_TAG=git-${CI_COMMIT_SHA:0:8}
+ - IMAGE_NAME="enterprise-integrations/iics_secure_agent:${IMAGE_TAG}"
+ - ECR_IMAGE_NAME="${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/enterprise-integrations/iics_secure_agent:${IMAGE_TAG}"
- apk update && apk add groff less && apk add python3
- pip3 install awscli
- - (aws ecr get-login --no-include-email --region us-east-2) > login.sh
- - sh login.sh
+ - $(aws ecr get-login --no-include-email --region us-east-1)
after_script:
- - docker logout "$AWS_ACCOUNT_ID".dkr.ecr.us-east-2.amazonaws.com
+ - docker logout "$AWS_ACCOUNT_ID".dkr.ecr.us-east-1.amazonaws.com
image: docker:latest
@@ -19,12 +21,13 @@ build-master:
tags:
- docker
script:
- - docker build -t enterprise-integrations/iics_secure_agent .
- - docker tag enterprise-integrations/iics_secure_agent:latest "$AWS_ACCOUNT_ID".dkr.ecr.us-east-2.amazonaws.com/enterprise-integrations/iics_secure_agent:latest
- - docker push "$AWS_ACCOUNT_ID".dkr.ecr.us-east-2.amazonaws.com/enterprise-integrations/iics_secure_agent:latest
+ - docker build --pull --rm -t ${IMAGE_NAME} .
+ - docker tag ${IMAGE_NAME} ${ECR_IMAGE_NAME}
+ - docker push ${ECR_IMAGE_NAME}
only:
refs:
- master
changes:
- Dockerfile
- .gitlab-ci.yml
+ - run-agent.sh
--
GitLab