7
7
required : true
8
8
9
9
env :
10
- AWS_DEFAULT_REGION : us-east-1
10
+ AWS_PUBLIC_ECR_REGION : us-east-1
11
+ AWS_PRIVATE_ECR_REGION : us-west-2
11
12
TEST_TAG : public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
13
+ PUBLIC_REPOSITORY : public.ecr.aws/aws-observability/adot-autoinstrumentation-java
14
+ PRIVATE_REPOSITORY : 020628701572.dkr.ecr.us-west-2.amazonaws.com/adot-autoinstrumentation-java
15
+ PRIVATE_REGISTRY : 020628701572.dkr.ecr.us-west-2.amazonaws.com
12
16
13
17
permissions :
14
18
id-token : write
37
41
uses : aws-actions/configure-aws-credentials@v4
38
42
with :
39
43
role-to-assume : ${{ secrets.AWS_ASSUME_ROLE_ARN }}
40
- aws-region : ${{ env.AWS_DEFAULT_REGION }}
44
+ aws-region : ${{ env.AWS_PUBLIC_ECR_REGION }}
41
45
42
46
- name : Log in to AWS ECR
43
47
uses : docker/login-action@v3
@@ -53,13 +57,24 @@ jobs:
53
57
uses : aws-actions/configure-aws-credentials@v4
54
58
with :
55
59
role-to-assume : ${{ secrets.AWS_ASSUME_ROLE_ARN_RELEASE }}
56
- aws-region : ${{ env.AWS_DEFAULT_REGION }}
60
+ aws-region : ${{ env.AWS_PUBLIC_ECR_REGION }}
57
61
58
62
- name : Log in to AWS ECR
59
63
uses : docker/login-action@v3
60
64
with :
61
65
registry : public.ecr.aws
62
66
67
+ - name : Configure AWS Credentials for Private ECR
68
+ uses : aws-actions/configure-aws-credentials@v4
69
+ with :
70
+ role-to-assume : ${{ secrets.AWS_ASSUME_ROLE_ARN_RELEASE }}
71
+ aws-region : ${{ env.AWS_PRIVATE_ECR_REGION }}
72
+
73
+ - name : Log in to AWS private ECR
74
+ uses : docker/login-action@v3
75
+ with :
76
+ registry : ${{ env.PRIVATE_REGISTRY }}
77
+
63
78
- name : Set up QEMU
64
79
uses : docker/setup-qemu-action@v3
65
80
88
103
context : .
89
104
platforms : linux/amd64,linux/arm64
90
105
tags : |
91
- public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v${{ github.event.inputs.version }}
106
+ ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
107
+ ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
92
108
93
109
- name : Build and Publish release with Gradle
94
110
uses : gradle/gradle-build-action@v2
0 commit comments