Skip to content

Commit 7cbb38d

Browse files
committed
Replace AWS login action with Docker login action
This helps maintain consistency amongst the various actions used within the GH actions CD workflow
1 parent 41fd3fa commit 7cbb38d

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

.github/workflows/alpine-mainline.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ jobs:
5252
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
5353
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
5454

55-
- name: Login to Amazon ECR
56-
uses: aws-actions/amazon-ecr-login@v2
55+
- name: Login to Amazon ECR Public Gallery
56+
uses: docker/login-action@v3
5757
with:
58-
registry-type: public
58+
registry: public.ecr.aws
5959

6060
- name: Login to Docker Hub
6161
uses: docker/login-action@v3
@@ -161,10 +161,10 @@ jobs:
161161
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
162162
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
163163

164-
- name: Login to Amazon ECR
165-
uses: aws-actions/amazon-ecr-login@v2
164+
- name: Login to Amazon ECR Public Gallery
165+
uses: docker/login-action@v3
166166
with:
167-
registry-type: public
167+
registry: public.ecr.aws
168168

169169
- name: Login to Docker Hub
170170
uses: docker/login-action@v3
@@ -270,10 +270,10 @@ jobs:
270270
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
271271
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
272272

273-
- name: Login to Amazon ECR
274-
uses: aws-actions/amazon-ecr-login@v2
273+
- name: Login to Amazon ECR Public Gallery
274+
uses: docker/login-action@v3
275275
with:
276-
registry-type: public
276+
registry: public.ecr.aws
277277

278278
- name: Login to Docker Hub
279279
uses: docker/login-action@v3

.github/workflows/alpine-stable.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ jobs:
5252
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
5353
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
5454

55-
- name: Login to Amazon ECR
56-
uses: aws-actions/amazon-ecr-login@v2
55+
- name: Login to Amazon ECR Public Gallery
56+
uses: docker/login-action@v3
5757
with:
58-
registry-type: public
58+
registry: public.ecr.aws
5959

6060
- name: Login to Docker Hub
6161
uses: docker/login-action@v3
@@ -153,10 +153,10 @@ jobs:
153153
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
154154
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
155155

156-
- name: Login to Amazon ECR
157-
uses: aws-actions/amazon-ecr-login@v2
156+
- name: Login to Amazon ECR Public Gallery
157+
uses: docker/login-action@v3
158158
with:
159-
registry-type: public
159+
registry: public.ecr.aws
160160

161161
- name: Login to Docker Hub
162162
uses: docker/login-action@v3
@@ -254,10 +254,10 @@ jobs:
254254
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
255255
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
256256

257-
- name: Login to Amazon ECR
258-
uses: aws-actions/amazon-ecr-login@v2
257+
- name: Login to Amazon ECR Public Gallery
258+
uses: docker/login-action@v3
259259
with:
260-
registry-type: public
260+
registry: public.ecr.aws
261261

262262
- name: Login to Docker Hub
263263
uses: docker/login-action@v3

.github/workflows/debian-mainline.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ jobs:
5252
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
5353
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
5454

55-
- name: Login to Amazon ECR
56-
uses: aws-actions/amazon-ecr-login@v2
55+
- name: Login to Amazon ECR Public Gallery
56+
uses: docker/login-action@v3
5757
with:
58-
registry-type: public
58+
registry: public.ecr.aws
5959

6060
- name: Login to Docker Hub
6161
uses: docker/login-action@v3
@@ -161,10 +161,10 @@ jobs:
161161
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
162162
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
163163

164-
- name: Login to Amazon ECR
165-
uses: aws-actions/amazon-ecr-login@v2
164+
- name: Login to Amazon ECR Public Gallery
165+
uses: docker/login-action@v3
166166
with:
167-
registry-type: public
167+
registry: public.ecr.aws
168168

169169
- name: Login to Docker Hub
170170
uses: docker/login-action@v3

.github/workflows/debian-stable.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ jobs:
5252
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
5353
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
5454

55-
- name: Login to Amazon ECR
56-
uses: aws-actions/amazon-ecr-login@v2
55+
- name: Login to Amazon ECR Public Gallery
56+
uses: docker/login-action@v3
5757
with:
58-
registry-type: public
58+
registry: public.ecr.aws
5959

6060
- name: Login to Docker Hub
6161
uses: docker/login-action@v3
@@ -153,10 +153,10 @@ jobs:
153153
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
154154
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
155155

156-
- name: Login to Amazon ECR
157-
uses: aws-actions/amazon-ecr-login@v2
156+
- name: Login to Amazon ECR Public Gallery
157+
uses: docker/login-action@v3
158158
with:
159-
registry-type: public
159+
registry: public.ecr.aws
160160

161161
- name: Login to Docker Hub
162162
uses: docker/login-action@v3

0 commit comments

Comments
 (0)