Skip to content

Commit 2bca68e

Browse files
brivutoini
andauthored
refactor: revert to eval (#321)
* refactor: use eval instead of circleci env subst (#307) * Revert back to eval echo instead of circleci env subst * Trigger build * Disable integration tests * Disable integration tests * Use tibber's circle ci publishing context * Fix piped commands * Enable integration tests * Set orb_name * Rename ORB_STR to ORB_EVAL when echo eval used to set value * Fix merge error * Fix ORB_STR_AWS_DOMAIN * Set profile for put-lifecycle-policy * refactor: trim CIRCLE_SHA1 * fix: edit repo url * refactor: rename varaibles to match orb standards --------- Co-authored-by: Toni Juvani <[email protected]>
1 parent 441f120 commit 2bca68e

13 files changed

+155
-151
lines changed

.circleci/test-deploy.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ workflows:
113113
role_arn: arn:aws:iam::122211685980:role/CPE_ECR_OIDC_TEST
114114
attach_workspace: true
115115
workspace_root: workspace
116-
repo: aws-ecr-orb-${CIRCLE_SHA1}-build-test-then-push-with-buildx
116+
repo: aws-ecr-orb-${CIRCLE_SHA1:0:7}-build-test-then-push-with-buildx
117117
create_repo: true
118118
context: [CPE-OIDC]
119119
tag: alpha
@@ -125,7 +125,7 @@ workflows:
125125
post-steps:
126126
- run:
127127
name: "Delete repository"
128-
command: aws ecr delete-repository --repository-name aws-ecr-orb-${CIRCLE_SHA1}-build-test-then-push-with-buildx --region us-west-2 --force
128+
command: aws ecr delete-repository --repository-name aws-ecr-orb-${CIRCLE_SHA1:0:7}-build-test-then-push-with-buildx --region us-west-2 --force
129129
filters: *filters
130130
requires: [pre-integration]
131131
- aws-ecr/build_and_push_image:
@@ -145,7 +145,7 @@ workflows:
145145
post-steps:
146146
- run:
147147
name: "Delete repository"
148-
command: aws ecr delete-repository --repository-name aws-ecr-orb-${CIRCLE_SHA1}-multi-platform-without-push --region us-west-2 --force
148+
command: aws ecr delete-repository --repository-name aws-ecr-orb-${CIRCLE_SHA1:0:7}-multi-platform-without-push --region us-west-2 --force
149149
push_image: false
150150
platform: linux/amd64,linux/arm64
151151
filters: *filters
@@ -169,7 +169,7 @@ workflows:
169169
post-steps:
170170
- run:
171171
name: "Delete repository"
172-
command: aws ecr delete-repository --repository-name --region us-west-2 aws-ecr-orb-${CIRCLE_SHA1}-default-profile --force
172+
command: aws ecr delete-repository --repository-name --region us-west-2 aws-ecr-orb-${CIRCLE_SHA1:0:7}-default-profile --force
173173
platform: linux/amd64,linux/arm64
174174
filters: *filters
175175
requires: [pre-integration]
@@ -211,7 +211,7 @@ workflows:
211211
post-steps:
212212
- run:
213213
name: "Delete repository"
214-
command: aws ecr-public delete-repository --region us-east-1 --repository-name aws-ecr-orb-${CIRCLE_SHA1}-public_registry --force --profile OIDC-User
214+
command: aws ecr-public delete-repository --region us-east-1 --repository-name aws-ecr-orb-${CIRCLE_SHA1:0:7}-public_registry --force --profile OIDC-User
215215
platform: linux/arm64,linux/amd64
216216
filters: *filters
217217
requires: [pre-integration]
@@ -273,7 +273,7 @@ workflows:
273273
post-steps:
274274
- run:
275275
name: "Delete repository"
276-
command: aws ecr delete-repository --repository-name aws-ecr-orb-${CIRCLE_SHA1}-named-profile --force --profile OIDC-User
276+
command: aws ecr delete-repository --repository-name aws-ecr-orb-${CIRCLE_SHA1:0:7}-named-profile --force --profile OIDC-User
277277
filters: *filters
278278
requires:
279279
- integration-test-tag-existing-image
@@ -312,7 +312,7 @@ workflows:
312312
profile_name: "OIDC-User"
313313
context: [CPE-OIDC]
314314
workspace_root: workspace
315-
repo: aws-ecr-orb-${CIRCLE_SHA1}-skip_when_tags_exist-<<matrix.executor>>
315+
repo: aws-ecr-orb-${CIRCLE_SHA1:0:7}-skip_when_tags_exist-<<matrix.executor>>
316316
tag: integration,myECRRepoTag
317317
dockerfile: sample/Dockerfile
318318
path: workspace
@@ -322,7 +322,7 @@ workflows:
322322
- run:
323323
name: "Delete repository"
324324
command: |
325-
aws ecr delete-repository --repository-name aws-ecr-orb-${CIRCLE_SHA1}-skip_when_tags_exist-<<matrix.executor>> --force --profile OIDC-User
325+
aws ecr delete-repository --repository-name aws-ecr-orb-${CIRCLE_SHA1:0:7}-skip_when_tags_exist-<<matrix.executor>> --force --profile OIDC-User
326326
matrix:
327327
parameters:
328328
executor: ["amd64", "arm64"]

src/commands/build_image.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -109,21 +109,21 @@ steps:
109109
- run:
110110
name: Build Docker Image with buildx
111111
environment:
112-
ORB_STR_TAG: << parameters.tag >>
113-
ORB_BOOL_SKIP_WHEN_TAGS_EXIST: <<parameters.skip_when_tags_exist>>
114-
ORB_STR_REPO: << parameters.repo >>
115-
ORB_STR_EXTRA_BUILD_ARGS: <<parameters.extra_build_args>>
116-
ORB_EVAL_PATH: <<parameters.path>>
117-
ORB_STR_DOCKERFILE: <<parameters.dockerfile>>
118-
ORB_STR_PROFILE_NAME: <<parameters.profile_name>>
119-
ORB_STR_ACCOUNT_ID: <<parameters.account_id>>
120-
ORB_STR_REGION: <<parameters.region>>
121-
ORB_STR_PLATFORM: <<parameters.platform>>
122-
ORB_BOOL_PUBLIC_REGISTRY: <<parameters.public_registry>>
123-
ORB_BOOL_PUSH_IMAGE: <<parameters.push_image>>
124-
ORB_STR_LIFECYCLE_POLICY_PATH: <<parameters.lifecycle_policy_path>>
125-
ORB_STR_PUBLIC_REGISTRY_ALIAS: <<parameters.public_registry_alias>>
126-
ORB_EVAL_BUILD_PATH: <<parameters.build_path>>
127-
ORB_STR_AWS_DOMAIN: <<parameters.aws_domain>>
112+
AWS_ECR_STR_TAG: << parameters.tag >>
113+
AWS_ECR_BOOL_SKIP_WHEN_TAGS_EXIST: <<parameters.skip_when_tags_exist>>
114+
AWS_ECR_STR_REPO: << parameters.repo >>
115+
AWS_ECR_STR_EXTRA_BUILD_ARGS: <<parameters.extra_build_args>>
116+
AWS_ECR_EVAL_PATH: <<parameters.path>>
117+
AWS_ECR_STR_DOCKERFILE: <<parameters.dockerfile>>
118+
AWS_ECR_STR_PROFILE_NAME: <<parameters.profile_name>>
119+
AWS_ECR_STR_ACCOUNT_ID: <<parameters.account_id>>
120+
AWS_ECR_STR_REGION: <<parameters.region>>
121+
AWS_ECR_STR_PLATFORM: <<parameters.platform>>
122+
AWS_ECR_BOOL_PUBLIC_REGISTRY: <<parameters.public_registry>>
123+
AWS_ECR_BOOL_PUSH_IMAGE: <<parameters.push_image>>
124+
AWS_ECR_STR_LIFECYCLE_POLICY_PATH: <<parameters.lifecycle_policy_path>>
125+
AWS_ECR_STR_PUBLIC_REGISTRY_ALIAS: <<parameters.public_registry_alias>>
126+
AWS_ECR_EVAL_BUILD_PATH: <<parameters.build_path>>
127+
AWS_ECR_STR_AWS_DOMAIN: <<parameters.aws_domain>>
128128
command: <<include(scripts/docker_buildx.sh)>>
129129
no_output_timeout: <<parameters.no_output_timeout>>

src/commands/create_repo.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ steps:
4545
- run:
4646
name: Create Repository
4747
environment:
48-
ORB_STR_PROFILE_NAME: <<parameters.profile_name>>
49-
ORB_STR_REGION: <<parameters.region>>
50-
ORB_STR_REPO: <<parameters.repo>>
51-
ORB_BOOL_REPO_SCAN_ON_PUSH: <<parameters.repo_scan_on_push>>
52-
ORB_BOOL_PUBLIC_REGISTRY: <<parameters.public_registry>>
53-
ORB_ENUM_ENCRYPTION_TYPE: <<parameters.repo_encryption_type>>
54-
ORB_STR_ENCRYPTION_KMS_KEY: <<parameters.encryption_kms_key>>
48+
AWS_ECR_STR_PROFILE_NAME: <<parameters.profile_name>>
49+
AWS_ECR_STR_REGION: <<parameters.region>>
50+
AWS_ECR_STR_REPO: <<parameters.repo>>
51+
AWS_ECR_BOOL_REPO_SCAN_ON_PUSH: <<parameters.repo_scan_on_push>>
52+
AWS_ECR_BOOL_PUBLIC_REGISTRY: <<parameters.public_registry>>
53+
AWS_ECR_ENUM_ENCRYPTION_TYPE: <<parameters.repo_encryption_type>>
54+
AWS_ECR_STR_ENCRYPTION_KMS_KEY: <<parameters.encryption_kms_key>>
5555
command: <<include(scripts/create_repo.sh)>>

src/commands/ecr_login.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ steps:
3737
- run:
3838
name: Log into Amazon ECR with profile <<parameters.profile_name>>
3939
environment:
40-
ORB_STR_PROFILE_NAME: <<parameters.profile_name>>
41-
ORB_STR_ACCOUNT_ID: <<parameters.account_id>>
42-
ORB_STR_REGION: <<parameters.region>>
43-
ORB_BOOL_PUBLIC_REGISTRY: <<parameters.public_registry>>
44-
ORB_STR_AWS_DOMAIN: <<parameters.aws_domain>>
40+
AWS_ECR_STR_PROFILE_NAME: <<parameters.profile_name>>
41+
AWS_ECR_STR_ACCOUNT_ID: <<parameters.account_id>>
42+
AWS_ECR_STR_REGION: <<parameters.region>>
43+
AWS_ECR_BOOL_PUBLIC_REGISTRY: <<parameters.public_registry>>
44+
AWS_ECR_STR_AWS_DOMAIN: <<parameters.aws_domain>>
4545
command: <<include(scripts/ecr_login.sh)>>

src/commands/push_image.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ steps:
3939
- run:
4040
name: Push image to AWS ECR
4141
environment:
42-
ORB_STR_REPO: << parameters.repo >>
43-
ORB_STR_REGION: << parameters.region >>
44-
ORB_STR_TAG: << parameters.tag >>
45-
ORB_BOOL_PUBLIC_REGISTRY: <<parameters.public_registry>>
46-
ORB_STR_PUBLIC_REGISTRY_ALIAS: <<parameters.public_registry_alias>>
47-
ORB_STR_ACCOUNT_ID: << parameters.account_id >>
48-
ORB_STR_AWS_DOMAIN: <<parameters.aws_domain>>
42+
AWS_ECR_STR_REPO: << parameters.repo >>
43+
AWS_ECR_STR_REGION: << parameters.region >>
44+
AWS_ECR_STR_TAG: << parameters.tag >>
45+
AWS_ECR_BOOL_PUBLIC_REGISTRY: <<parameters.public_registry>>
46+
AWS_ECR_STR_PUBLIC_REGISTRY_ALIAS: <<parameters.public_registry_alias>>
47+
AWS_ECR_STR_ACCOUNT_ID: << parameters.account_id >>
48+
AWS_ECR_STR_AWS_DOMAIN: <<parameters.aws_domain>>
4949
command: << include(scripts/push_image.sh) >>

src/commands/set_repo_policy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ steps:
3333
- run:
3434
name: Set Repository Policy
3535
environment:
36-
ORB_STR_PROFILE_NAME: <<parameters.profile_name>>
37-
ORB_STR_REGION: <<parameters.region>>
38-
ORB_STR_REPO: <<parameters.repo>>
39-
ORB_BOOL_PUBLIC_REGISTRY: <<parameters.public_registry>>
40-
ORB_STR_REPO_POLICY_PATH: <<parameters.repo_policy_path>>
36+
AWS_ECR_STR_PROFILE_NAME: <<parameters.profile_name>>
37+
AWS_ECR_STR_REGION: <<parameters.region>>
38+
AWS_ECR_STR_REPO: <<parameters.repo>>
39+
AWS_ECR_BOOL_PUBLIC_REGISTRY: <<parameters.public_registry>>
40+
AWS_ECR_STR_REPO_POLICY_PATH: <<parameters.repo_policy_path>>
4141
command: <<include(scripts/set_repo_policy.sh)>>

src/commands/tag_image.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ steps:
2525
- run:
2626
name: <<parameters.target_tag>> tag to <<parameters.repo>>:<<parameters.source_tag>>
2727
environment:
28-
ORB_STR_REPO: <<parameters.repo>>
29-
ORB_STR_SOURCE_TAG: <<parameters.source_tag>>
30-
ORB_STR_TARGET_TAG: <<parameters.target_tag>>
31-
ORB_BOOL_SKIP_WHEN_TAGS_EXIST: <<parameters.skip_when_tags_exist>>
28+
AWS_ECR_STR_REPO: <<parameters.repo>>
29+
AWS_ECR_STR_SOURCE_TAG: <<parameters.source_tag>>
30+
AWS_ECR_STR_TARGET_TAG: <<parameters.target_tag>>
31+
AWS_ECR_BOOL_SKIP_WHEN_TAGS_EXIST: <<parameters.skip_when_tags_exist>>
3232
command: <<include(scripts/tag_image.sh)>>

src/scripts/create_repo.sh

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
#!/bin/bash
2-
ORB_STR_REGION="$(circleci env subst "${ORB_STR_REGION}")"
3-
ORB_STR_REPO="$(circleci env subst "${ORB_STR_REPO}")"
4-
ORB_STR_PROFILE_NAME="$(circleci env subst "${ORB_STR_PROFILE_NAME}")"
5-
ORB_STR_ENCRYPTION_KMS_KEY="$(circleci env subst "${ORB_STR_ENCRYPTION_KMS_KEY}")"
2+
AWS_ECR_EVAL_REGION="$(eval echo "${AWS_ECR_STR_REGION}")"
3+
AWS_ECR_EVAL_REPO="$(eval echo "${AWS_ECR_STR_REPO}")"
4+
AWS_ECR_EVAL_PROFILE_NAME="$(eval echo "${AWS_ECR_STR_PROFILE_NAME}")"
5+
AWS_ECR_EVAL_ENCRYPTION_KMS_KEY="$(eval echo "${AWS_ECR_STR_ENCRYPTION_KMS_KEY}")"
66

7-
if [ "$ORB_BOOL_PUBLIC_REGISTRY" == "1" ]; then
8-
aws ecr-public describe-repositories --profile "${ORB_STR_PROFILE_NAME}" --region us-east-1 --repository-names "${ORB_STR_REPO}" >/dev/null 2>&1 ||
9-
aws ecr-public create-repository --profile "${ORB_STR_PROFILE_NAME}" --region us-east-1 --repository-name "${ORB_STR_REPO}"
7+
if [ "$AWS_ECR_BOOL_PUBLIC_REGISTRY" == "1" ]; then
8+
aws ecr-public describe-repositories --profile "${AWS_ECR_EVAL_PROFILE_NAME}" --region us-east-1 --repository-names "${AWS_ECR_EVAL_REPO}" >/dev/null 2>&1 ||
9+
aws ecr-public create-repository --profile "${AWS_ECR_EVAL_PROFILE_NAME}" --region us-east-1 --repository-name "${AWS_ECR_EVAL_REPO}"
1010
else
1111

1212
IMAGE_SCANNING_CONFIGURATION="scanOnPush=true"
13-
if [ "$ORB_BOOL_REPO_SCAN_ON_PUSH" -ne "1" ]; then
13+
if [ "$AWS_ECR_BOOL_REPO_SCAN_ON_PUSH" -ne "1" ]; then
1414
IMAGE_SCANNING_CONFIGURATION="scanOnPush=false"
1515
fi
1616

17-
ENCRYPTION_CONFIGURATION="encryptionType=${ORB_ENUM_ENCRYPTION_TYPE}"
18-
if [ "$ORB_ENUM_ENCRYPTION_TYPE" == "KMS" ]; then
19-
ENCRYPTION_CONFIGURATION+=",kmsKey=${ORB_STR_ENCRYPTION_KMS_KEY}"
17+
ENCRYPTION_CONFIGURATION="encryptionType=${AWS_ECR_ENUM_ENCRYPTION_TYPE}"
18+
if [ "$AWS_ECR_ENUM_ENCRYPTION_TYPE" == "KMS" ]; then
19+
ENCRYPTION_CONFIGURATION+=",kmsKey=${AWS_ECR_EVAL_ENCRYPTION_KMS_KEY}"
2020
fi
2121

2222
aws ecr describe-repositories \
23-
--profile "${ORB_STR_PROFILE_NAME}" \
24-
--region "${ORB_STR_REGION}" \
25-
--repository-names "${ORB_STR_REPO}" >/dev/null 2>&1 ||
23+
--profile "${AWS_ECR_EVAL_PROFILE_NAME}" \
24+
--region "${AWS_ECR_EVAL_REGION}" \
25+
--repository-names "${AWS_ECR_EVAL_REPO}" >/dev/null 2>&1 ||
2626
aws ecr create-repository \
27-
--profile "${ORB_STR_PROFILE_NAME}" \
28-
--region "${ORB_STR_REGION}" \
29-
--repository-name "${ORB_STR_REPO}" \
27+
--profile "${AWS_ECR_EVAL_PROFILE_NAME}" \
28+
--region "${AWS_ECR_EVAL_REGION}" \
29+
--repository-name "${AWS_ECR_EVAL_REPO}" \
3030
--image-scanning-configuration "${IMAGE_SCANNING_CONFIGURATION}" \
3131
--encryption-configuration "${ENCRYPTION_CONFIGURATION}"
3232
fi

src/scripts/docker_buildx.sh

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
#!/bin/bash
2-
ORB_STR_REGION="$(circleci env subst "${ORB_STR_REGION}")"
3-
ORB_STR_REPO="$(circleci env subst "${ORB_STR_REPO}")"
4-
ORB_STR_TAG="$(circleci env subst "${ORB_STR_TAG}")"
5-
ORB_EVAL_PATH="$(eval echo "${ORB_EVAL_PATH}")"
6-
ORB_STR_AWS_DOMAIN="$(echo "${ORB_STR_AWS_DOMAIN}" | circleci env subst)"
7-
ORB_STR_ACCOUNT_ID="$(circleci env subst "${ORB_STR_ACCOUNT_ID}")"
8-
ORB_VAL_ACCOUNT_URL="${ORB_STR_ACCOUNT_ID}.dkr.ecr.${ORB_STR_REGION}.${ORB_STR_AWS_DOMAIN}"
9-
ORB_STR_PUBLIC_REGISTRY_ALIAS="$(circleci env subst "${ORB_STR_PUBLIC_REGISTRY_ALIAS}")"
10-
ORB_STR_EXTRA_BUILD_ARGS="$(echo "${ORB_STR_EXTRA_BUILD_ARGS}" | circleci env subst)"
11-
ORB_EVAL_BUILD_PATH="$(eval echo "${ORB_EVAL_BUILD_PATH}")"
12-
ORB_STR_DOCKERFILE="$(circleci env subst "${ORB_STR_DOCKERFILE}")"
13-
ORB_STR_PROFILE_NAME="$(circleci env subst "${ORB_STR_PROFILE_NAME}")"
14-
ORB_STR_PLATFORM="$(circleci env subst "${ORB_STR_PLATFORM}")"
15-
ORB_STR_LIFECYCLE_POLICY_PATH="$(circleci env subst "${ORB_STR_LIFECYCLE_POLICY_PATH}")"
2+
AWS_ECR_EVAL_REGION="$(eval echo "${AWS_ECR_STR_REGION}")"
3+
AWS_ECR_EVAL_REPO="$(eval echo "${AWS_ECR_STR_REPO}")"
4+
AWS_ECR_EVAL_TAG="$(eval echo "${AWS_ECR_STR_TAG}")"
5+
AWS_ECR_EVAL_PATH="$(eval echo "${AWS_ECR_EVAL_PATH}")"
6+
AWS_ECR_STR_AWS_DOMAIN="$(echo "${AWS_ECR_STR_AWS_DOMAIN}" | circleci env subst)"
7+
AWS_ECR_EVAL_ACCOUNT_ID="$(eval echo "${AWS_ECR_STR_ACCOUNT_ID}")"
8+
AWS_ECR_VAL_ACCOUNT_URL="${AWS_ECR_EVAL_ACCOUNT_ID}.dkr.ecr.${AWS_ECR_EVAL_REGION}.${AWS_ECR_STR_AWS_DOMAIN}"
9+
AWS_ECR_EVAL_PUBLIC_REGISTRY_ALIAS="$(eval echo "${AWS_ECR_STR_PUBLIC_REGISTRY_ALIAS}")"
10+
AWS_ECR_STR_EXTRA_BUILD_ARGS="$(echo "${AWS_ECR_STR_EXTRA_BUILD_ARGS}" | circleci env subst)"
11+
AWS_ECR_EVAL_BUILD_PATH="$(eval echo "${AWS_ECR_EVAL_BUILD_PATH}")"
12+
AWS_ECR_EVAL_DOCKERFILE="$(eval echo "${AWS_ECR_STR_DOCKERFILE}")"
13+
AWS_ECR_EVAL_PROFILE_NAME="$(eval echo "${AWS_ECR_STR_PROFILE_NAME}")"
14+
AWS_ECR_EVAL_PLATFORM="$(eval echo "${AWS_ECR_STR_PLATFORM}")"
15+
AWS_ECR_EVAL_LIFECYCLE_POLICY_PATH="$(eval echo "${AWS_ECR_STR_LIFECYCLE_POLICY_PATH}")"
1616

1717

18-
if [ -n "${ORB_STR_EXTRA_BUILD_ARGS}" ]; then
19-
IFS=" " read -a args -r <<< "${ORB_STR_EXTRA_BUILD_ARGS[@]}"
18+
if [ -n "${AWS_ECR_STR_EXTRA_BUILD_ARGS}" ]; then
19+
IFS=" " read -a args -r <<< "${AWS_ECR_STR_EXTRA_BUILD_ARGS[@]}"
2020
for arg in "${args[@]}"; do
2121
set -- "$@" "$arg"
2222
done
2323
fi
2424
ECR_COMMAND="ecr"
2525
number_of_tags_in_ecr=0
2626

27-
IFS=', ' read -ra platform <<<"${ORB_STR_PLATFORM}"
27+
IFS=', ' read -ra platform <<<"${AWS_ECR_EVAL_PLATFORM}"
2828
number_of_platforms="${#platform[@]}"
2929

30-
if [ -z "${ORB_STR_ACCOUNT_ID}" ]; then
30+
if [ -z "${AWS_ECR_EVAL_ACCOUNT_ID}" ]; then
3131
echo "The account ID is not found. Please add the account ID before continuing."
3232
exit 1
3333
fi
3434

35-
if [ "${ORB_BOOL_PUBLIC_REGISTRY}" -eq "1" ]; then
35+
if [ "${AWS_ECR_BOOL_PUBLIC_REGISTRY}" -eq "1" ]; then
3636
ECR_COMMAND="ecr-public"
37-
ORB_VAL_ACCOUNT_URL="public.ecr.aws/${ORB_STR_PUBLIC_REGISTRY_ALIAS}"
37+
AWS_ECR_VAL_ACCOUNT_URL="public.ecr.aws/${AWS_ECR_EVAL_PUBLIC_REGISTRY_ALIAS}"
3838
fi
3939

40-
IFS="," read -ra DOCKER_TAGS <<<"${ORB_STR_TAG}"
40+
IFS="," read -ra DOCKER_TAGS <<<"${AWS_ECR_EVAL_TAG}"
4141
for tag in "${DOCKER_TAGS[@]}"; do
42-
if [ "${ORB_BOOL_SKIP_WHEN_TAGS_EXIST}" -eq "1" ] || [ "${ORB_BOOL_SKIP_WHEN_TAGS_EXIST}" = "true" ]; then
43-
docker_tag_exists_in_ecr=$(aws "${ECR_COMMAND}" describe-images --profile "${ORB_STR_PROFILE_NAME}" --registry-id "${ORB_STR_ACCOUNT_ID}" --region "${ORB_STR_REGION}" --repository-name "${ORB_STR_REPO}" --query "contains(imageDetails[].imageTags[], '${tag}')")
42+
if [ "${AWS_ECR_BOOL_SKIP_WHEN_TAGS_EXIST}" -eq "1" ] || [ "${AWS_ECR_BOOL_SKIP_WHEN_TAGS_EXIST}" = "true" ]; then
43+
docker_tag_exists_in_ecr=$(aws "${ECR_COMMAND}" describe-images --profile "${AWS_ECR_EVAL_PROFILE_NAME}" --registry-id "${AWS_ECR_EVAL_ACCOUNT_ID}" --region "${AWS_ECR_EVAL_REGION}" --repository-name "${AWS_ECR_EVAL_REPO}" --query "contains(imageDetails[].imageTags[], '${tag}')")
4444
if [ "${docker_tag_exists_in_ecr}" = "true" ]; then
45-
docker pull "${ORB_VAL_ACCOUNT_URL}/${ORB_STR_REPO}:${tag}"
45+
docker pull "${AWS_ECR_VAL_ACCOUNT_URL}/${AWS_ECR_EVAL_REPO}:${tag}"
4646
number_of_tags_in_ecr=$((number_of_tags_in_ecr += 1))
4747
fi
4848
fi
49-
docker_tag_args="${docker_tag_args} -t ${ORB_VAL_ACCOUNT_URL}/${ORB_STR_REPO}:${tag}"
49+
docker_tag_args="${docker_tag_args} -t ${AWS_ECR_VAL_ACCOUNT_URL}/${AWS_ECR_EVAL_REPO}:${tag}"
5050
done
5151

52-
if [ "${ORB_BOOL_SKIP_WHEN_TAGS_EXIST}" -eq "0" ] || [[ "${ORB_BOOL_SKIP_WHEN_TAGS_EXIST}" -eq "1" && ${number_of_tags_in_ecr} -lt ${#DOCKER_TAGS[@]} ]]; then
53-
if [ "${ORB_BOOL_PUSH_IMAGE}" -eq "1" ]; then
52+
if [ "${AWS_ECR_BOOL_SKIP_WHEN_TAGS_EXIST}" -eq "0" ] || [[ "${AWS_ECR_BOOL_SKIP_WHEN_TAGS_EXIST}" -eq "1" && ${number_of_tags_in_ecr} -lt ${#DOCKER_TAGS[@]} ]]; then
53+
if [ "${AWS_ECR_BOOL_PUSH_IMAGE}" -eq "1" ]; then
5454
set -- "$@" --push
5555

56-
if [ -n "${ORB_STR_LIFECYCLE_POLICY_PATH}" ]; then
56+
if [ -n "${AWS_ECR_EVAL_LIFECYCLE_POLICY_PATH}" ]; then
5757
aws ecr put-lifecycle-policy \
58-
--profile "${ORB_STR_PROFILE_NAME}" \
59-
--repository-name "${ORB_STR_REPO}" \
60-
--lifecycle-policy-text "file://${ORB_STR_LIFECYCLE_POLICY_PATH}"
58+
--profile "${AWS_ECR_EVAL_PROFILE_NAME}" \
59+
--repository-name "${AWS_ECR_EVAL_REPO}" \
60+
--lifecycle-policy-text "file://${AWS_ECR_EVAL_LIFECYCLE_POLICY_PATH}"
6161
fi
6262

63-
elif [ "${ORB_BOOL_PUSH_IMAGE}" -eq "0" ] && [ "${number_of_platforms}" -le 1 ];then
63+
elif [ "${AWS_ECR_BOOL_PUSH_IMAGE}" -eq "0" ] && [ "${number_of_platforms}" -le 1 ];then
6464
set -- "$@" --load
6565
fi
6666

@@ -76,20 +76,20 @@ if [ "${ORB_BOOL_SKIP_WHEN_TAGS_EXIST}" -eq "0" ] || [[ "${ORB_BOOL_SKIP_WHEN_TA
7676
fi
7777
context_args="--context builder"
7878
# if no builder instance is currently used, create one
79-
elif ! docker buildx inspect | grep -q "default * docker"; then
80-
docker buildx create --name DLC_builder --use
81-
fi
79+
elif ! docker buildx inspect | grep -q "default * docker"; then
80+
docker buildx create --name DLC_builder --use
81+
fi
8282

8383
set -x
8484
docker \
8585
${context_args:+$context_args} \
8686
buildx build \
87-
-f "${ORB_EVAL_PATH}"/"${ORB_STR_DOCKERFILE}" \
87+
-f "${AWS_ECR_EVAL_PATH}"/"${AWS_ECR_EVAL_DOCKERFILE}" \
8888
${docker_tag_args:+$docker_tag_args} \
89-
--platform "${ORB_STR_PLATFORM}" \
89+
--platform "${AWS_ECR_EVAL_PLATFORM}" \
9090
--progress plain \
9191
"$@" \
92-
"${ORB_EVAL_BUILD_PATH}"
92+
"${AWS_ECR_EVAL_BUILD_PATH}"
9393
set +x
94-
94+
9595
fi

0 commit comments

Comments
 (0)