Skip to content

Commit fa9dd78

Browse files
authored
chore: remove legacy AWS ECR (#22)
1 parent afce3bb commit fa9dd78

File tree

3 files changed

+5
-37
lines changed

3 files changed

+5
-37
lines changed

.github/workflows/dev_builds.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,11 @@ jobs:
2121
- name: Show Buildx platforms
2222
run: echo ${{ steps.buildx.outputs.platforms }}
2323

24-
- name: Login to AWS public ECR
25-
run: make login
26-
env:
27-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_PUBLIC_ECR_ACCESS_KEY_ID }}
28-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PUBLIC_ECR_SECRET_ACCESS_KEY }}
29-
30-
- name: Build and push image
31-
run: make build-push-multiplatform
32-
3324
- name: Login to Open Source ECR
34-
run: make login-opensource
25+
run: make login
3526
env:
3627
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
3728
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
3829

3930
- name: Build and push image to Open Source ECR
40-
run: make build-push-multiplatform-opensource
31+
run: make build-push-multiplatform

.github/workflows/release_builds.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,11 @@ jobs:
3131
- name: Show Buildx platforms
3232
run: echo ${{ steps.buildx.outputs.platforms }}
3333

34-
- name: Login to AWS public ECR
35-
run: make login
36-
env:
37-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_PUBLIC_ECR_ACCESS_KEY_ID }}
38-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PUBLIC_ECR_SECRET_ACCESS_KEY }}
39-
40-
- name: Push kubernetes-setup image
41-
run: make build-push-multiplatform BUILD_TAG=${{ steps.extract_tag.outputs.tag }}
42-
4334
- name: Login to Open Source ECR
44-
run: make login-opensource
35+
run: make login
4536
env:
4637
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
4738
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
4839

4940
- name: Build and push image to Open Source ECR
50-
run: make build-push-multiplatform-opensource BUILD_TAG=${{ steps.extract_tag.outputs.tag }}
41+
run: make build-push-multiplatform BUILD_TAG=${{ steps.extract_tag.outputs.tag }}

Makefile

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
BUILD_TAG ?= latest
22
IMAGE_NAME = kubernetes-setup
3-
ECR_URL = public.ecr.aws/u5z5f8z6
3+
ECR_URL = public.ecr.aws/sumologic
44
REPO_URL = $(ECR_URL)/$(IMAGE_NAME)
5-
OPENSOURCE_ECR_URL = public.ecr.aws/a4t4y2n3
6-
OPENSOURCE_REPO_URL = $(OPENSOURCE_ECR_URL)/$(IMAGE_NAME)
75

86
build:
97
DOCKER_BUILDKIT=1 docker build \
@@ -22,18 +20,6 @@ login:
2220
| docker login --username AWS --password-stdin $(ECR_URL)
2321

2422
build-push-multiplatform:
25-
docker buildx build \
26-
--push \
27-
--platform linux/amd64,linux/arm/v7,linux/arm64 \
28-
--build-arg BUILD_TAG=$(BUILD_TAG) \
29-
--tag $(REPO_URL):$(BUILD_TAG) \
30-
.
31-
32-
login-opensource:
33-
aws ecr-public get-login-password --region us-east-1 \
34-
| docker login --username AWS --password-stdin $(OPENSOURCE_ECR_URL)
35-
36-
build-push-multiplatform-opensource:
3723
docker buildx build \
3824
--push \
3925
--platform linux/amd64,linux/arm/v7,linux/arm64 \

0 commit comments

Comments
 (0)