Skip to content

Commit e7129b2

Browse files
authored
Merge pull request #22 from MbolotSuse/eu-img-support
Changing pipeline to push only amd64 to ecr
2 parents a096376 + 5b4f95e commit e7129b2

File tree

1 file changed

+24
-43
lines changed

1 file changed

+24
-43
lines changed

.drone.yml

+24-43
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,23 @@ steps:
7474
registry:
7575
from_secret: aws_registry_id
7676
repo: suse/rancher/rancher-csp-adapter
77-
tag: "${DRONE_TAG}-amd64"
77+
tag: "${DRONE_TAG}"
78+
when:
79+
event:
80+
- tag
81+
82+
- name: ecr-publish-eu
83+
image: plugins/ecr
84+
settings:
85+
dockerfile: package/Dockerfile
86+
access_key:
87+
from_secret: ecr_access_key_eu
88+
secret_key:
89+
from_secret: ecr_secret_key_eu
90+
registry:
91+
from_secret: aws_registry_id_eu
92+
repo: suse/rancher/rancher-csp-adapter-eu
93+
tag: "${DRONE_TAG}"
7894
when:
7995
event:
8096
- tag
@@ -125,20 +141,6 @@ steps:
125141
event:
126142
- tag
127143

128-
- name: docker-publish
129-
image: plugins/docker
130-
settings:
131-
dockerfile: package/Dockerfile
132-
username:
133-
from_secret: docker_username
134-
password:
135-
from_secret: docker_password
136-
repo: "rancher/rancher-csp-adapter"
137-
tag: "${DRONE_TAG}-arm64"
138-
when:
139-
event:
140-
- tag
141-
142144
- name: docker-build
143145
image: plugins/docker
144146
settings:
@@ -150,17 +152,15 @@ steps:
150152
event:
151153
- pull_request
152154

153-
- name: ecr-publish
154-
image: plugins/ecr
155+
- name: docker-publish
156+
image: plugins/docker
155157
settings:
156158
dockerfile: package/Dockerfile
157-
access_key:
158-
from_secret: ecr_access_key
159-
secret_key:
160-
from_secret: ecr_secret_key
161-
registry:
162-
from_secret: aws_registry_id
163-
repo: suse/rancher/rancher-csp-adapter
159+
username:
160+
from_secret: docker_username
161+
password:
162+
from_secret: docker_password
163+
repo: "rancher/rancher-csp-adapter"
164164
tag: "${DRONE_TAG}-arm64"
165165
when:
166166
event:
@@ -197,25 +197,6 @@ steps:
197197
event:
198198
- tag
199199

200-
- name: aws-manifest
201-
image: registry.suse.com/bci/bci-base:latest
202-
environment:
203-
AWS_REGISTRY_ID:
204-
from_secret: aws_registry_id
205-
AWS_ACCESS_KEY_ID:
206-
from_secret: ecr_access_key
207-
AWS_SECRET_ACCESS_KEY:
208-
from_secret: ecr_secret_key
209-
AWS_REGION: "us-east-1"
210-
commands:
211-
- "zypper in -y aws-cli docker"
212-
- "aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin $AWS_REGISTRY_ID"
213-
- "docker manifest create $AWS_REGISTRY_ID/suse/rancher/rancher-csp-adapter:${DRONE_TAG} $AWS_REGISTRY_ID/suse/rancher/rancher-csp-adapter:${DRONE_TAG}-arm64 $AWS_REGISTRY_ID/suse/rancher/rancher-csp-adapter:${DRONE_TAG}-amd64"
214-
- "docker manifest push $AWS_REGISTRY_ID/suse/rancher/rancher-csp-adapter:${DRONE_TAG}"
215-
when:
216-
event:
217-
- tag
218-
219200
volumes:
220201
- name: docker
221202
host:

0 commit comments

Comments
 (0)