Skip to content

Commit ba3a9e1

Browse files
committed
Fix CI
We should be doing 'make ci' instead of 'make build' on pull_request. Also, split the release into two separate steps for US and EU registries since we can only authenticate to one at a time.
1 parent 47c107f commit ba3a9e1

File tree

2 files changed

+34
-4
lines changed

2 files changed

+34
-4
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ jobs:
99
- name: Checkout Code
1010
uses: actions/checkout@v4
1111
- name: Run Dapper CI
12-
run: make build
12+
run: make ci

.github/workflows/release.yml

+33-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
uses: actions/checkout@v4
3636
- name: Set up Docker Buildx
3737
uses: docker/setup-buildx-action@v3
38+
with:
39+
buildkitd-flags: --debug
3840
- name: Set up QEMU
3941
uses: docker/setup-qemu-action@v3
4042
- name: Run Dapper CI
@@ -57,7 +59,6 @@ jobs:
5759
images: |
5860
docker.io/rancher/rancher-csp-adapter
5961
709825985650.dkr.ecr.us-east-1.amazonaws.com/suse/rancher/rancher-csp-adapter
60-
709825985650.dkr.ecr.us-east-1.amazonaws.com/suse/rancher/rancher-csp-adapter-eu
6162
flavor: |
6263
latest=false
6364
- name: Read Secrets
@@ -81,8 +82,10 @@ jobs:
8182
aws-access-key-id: ${{ env.ECR_ACCESS_KEY }}
8283
aws-secret-access-key: ${{ env.ECR_SECRET_KEY }}
8384
aws-region: us-east-1
84-
- name: Login to Amazon ECR
85-
uses: aws-actions/amazon-ecr-login@v1
85+
- name: Login to ECR
86+
uses: docker/login-action@v2
87+
with:
88+
registry: 709825985650.dkr.ecr.us-east-1.amazonaws.com
8689
- name: Push Images to Registries
8790
uses: docker/build-push-action@v5
8891
with:
@@ -92,3 +95,30 @@ jobs:
9295
labels: ${{ steps.metadata.outputs.labels }}
9396
file: package/Dockerfile
9497
platforms: linux/amd64
98+
- name: Build Manifest for EU Registry Images
99+
id: metadata_eu
100+
uses: docker/metadata-action@v5
101+
with:
102+
images: |
103+
709825985650.dkr.ecr.us-east-1.amazonaws.com/suse/rancher/rancher-csp-adapter-eu
104+
flavor: |
105+
latest=false
106+
- name: Configure AWS credentials for EU Registry
107+
uses: aws-actions/configure-aws-credentials@v4
108+
with:
109+
aws-access-key-id: ${{ env.ECR_ACCESS_KEY_EU }}
110+
aws-secret-access-key: ${{ env.ECR_SECRET_KEY_EU }}
111+
aws-region: us-east-1
112+
- name: Login to ECR for EU Registry
113+
uses: docker/login-action@v2
114+
with:
115+
registry: 709825985650.dkr.ecr.us-east-1.amazonaws.com
116+
- name: Push Images to EU Registry
117+
uses: docker/build-push-action@v5
118+
with:
119+
context: .
120+
push: true
121+
tags: ${{ steps.metadata_eu.outputs.tags }}
122+
labels: ${{ steps.metadata_eu.outputs.labels }}
123+
file: package/Dockerfile
124+
platforms: linux/amd64

0 commit comments

Comments
 (0)