Skip to content

Commit a576d74

Browse files
tikolskytikolsky
authored
Lihiz release (#1414)
* Revert "Revert "DEVOPS-499: Add push to aquasec Azure reg upon Starboard releases (#1404)" (#1413)" This reverts commit c936e9c. * Remove login to aquasec for tests * Remove login to aquasec for tests * Remove login to aquasec for tests * Remove login to aquasec for tests
1 parent c936e9c commit a576d74

File tree

2 files changed

+59
-1
lines changed

2 files changed

+59
-1
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,24 @@ jobs:
177177
with:
178178
fetch-depth: 0
179179
- name: Login to docker.io registry
180-
uses: docker/login-action@v2
180+
uses: docker/login-action@v3
181181
with:
182182
username: ${{ secrets.DOCKERHUB_USER }}
183183
password: ${{ secrets.DOCKERHUB_TOKEN }}
184+
- name: login to Aqua Container Registry
185+
uses: docker/login-action@v3
186+
with:
187+
registry: ${{ secrets.AQUSEC_ACR_REGISTRY_NAME }}
188+
username: ${{ secrets.AQUASEC_ACR_USERNAME }}
189+
password: ${{ secrets.AQUASEC_ACR_PASSWORD }}
184190
- name: Release
185191
uses: goreleaser/goreleaser-action@v3
186192
with:
187193
version: v1.7.0
188194
args: release --rm-dist
189195
env:
190196
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
197+
AQUSEC_ACR_REGISTRY_NAME: ${{ secrets.AQUSEC_ACR_REGISTRY_NAME }}
191198
# - name: Update new version for plugin 'starboard' in krew-index
192199
# uses: rajatjindal/krew-release-bot@v0.0.43
193200
- name: Cleanup Docker and KIND resources

‎.goreleaser.yaml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ changelog:
9494
dockers:
9595
- image_templates:
9696
- "docker.io/aquasec/starboard:{{ .Version }}-amd64"
97+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard:{{ .Version }}-amd64"
9798
use: buildx
9899
goos: linux
99100
dockerfile: build/starboard/Dockerfile
@@ -112,6 +113,7 @@ dockers:
112113
- "--platform=linux/amd64"
113114
- image_templates:
114115
- "docker.io/aquasec/starboard-operator:{{ .Version }}-amd64"
116+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-amd64"
115117
use: buildx
116118
goos: linux
117119
dockerfile: build/starboard-operator/Dockerfile
@@ -150,6 +152,7 @@ dockers:
150152
# - LICENSE
151153
- image_templates:
152154
- "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-amd64"
155+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-amd64"
153156
use: buildx
154157
goos: linux
155158
dockerfile: build/starboard-operator/Dockerfile.ubi9
@@ -170,6 +173,7 @@ dockers:
170173
- LICENSE
171174
- image_templates:
172175
- "docker.io/aquasec/starboard-scanner-aqua:{{ .Version }}-amd64"
176+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-scanner-aqua:{{ .Version }}-amd64"
173177
use: buildx
174178
goos: linux
175179
dockerfile: build/scanner-aqua/Dockerfile
@@ -188,6 +192,7 @@ dockers:
188192
- "--platform=linux/amd64"
189193
- image_templates:
190194
- "docker.io/aquasec/starboard-operator:{{ .Version }}-arm64"
195+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-arm64"
191196
use: buildx
192197
goos: linux
193198
dockerfile: build/starboard-operator/Dockerfile
@@ -226,6 +231,7 @@ dockers:
226231
# - LICENSE
227232
- image_templates:
228233
- "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-arm64"
234+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-arm64"
229235
use: buildx
230236
goos: linux
231237
dockerfile: build/starboard-operator/Dockerfile.ubi9
@@ -246,6 +252,7 @@ dockers:
246252
- LICENSE
247253
- image_templates:
248254
- "docker.io/aquasec/starboard-operator:{{ .Version }}-s390x"
255+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-s390x"
249256
use: buildx
250257
goos: linux
251258
dockerfile: build/starboard-operator/Dockerfile
@@ -264,6 +271,7 @@ dockers:
264271
- "--platform=linux/s390x"
265272
- image_templates:
266273
- "docker.io/aquasec/starboard-operator:{{ .Version }}-ppc64le"
274+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ppc64le"
267275
use: buildx
268276
goos: linux
269277
dockerfile: build/starboard-operator/Dockerfile
@@ -302,6 +310,7 @@ dockers:
302310
# - LICENSE
303311
- image_templates:
304312
- "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-s390x"
313+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-s390x"
305314
use: buildx
306315
goos: linux
307316
dockerfile: build/starboard-operator/Dockerfile.ubi9
@@ -342,6 +351,7 @@ dockers:
342351
# - LICENSE
343352
- image_templates:
344353
- "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-ppc64le"
354+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-ppc64le"
345355
use: buildx
346356
goos: linux
347357
dockerfile: build/starboard-operator/Dockerfile.ubi9
@@ -382,6 +392,7 @@ dockers:
382392
# - LICENSE
383393
- image_templates:
384394
- "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-fips-amd64"
395+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-fips-amd64"
385396
use: buildx
386397
goos: linux
387398
dockerfile: build/starboard-operator/Dockerfile.fips.ubi9
@@ -462,6 +473,7 @@ dockers:
462473
# - LICENSE
463474
- image_templates:
464475
- "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-fips-amd64"
476+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-fips-amd64"
465477
use: buildx
466478
goos: linux
467479
dockerfile: build/starboard-operator/Dockerfile.fips.ubi9
@@ -482,6 +494,7 @@ dockers:
482494
- LICENSE
483495
- image_templates:
484496
- "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-fips-arm64"
497+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-fips-arm64"
485498
use: buildx
486499
goos: linux
487500
dockerfile: build/starboard-operator/Dockerfile.fips.ubi9
@@ -502,6 +515,7 @@ dockers:
502515
- LICENSE
503516
- image_templates:
504517
- "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-fips-s390x"
518+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-fips-s390x"
505519
use: buildx
506520
goos: linux
507521
dockerfile: build/starboard-operator/Dockerfile.fips.ubi9
@@ -522,6 +536,7 @@ dockers:
522536
- LICENSE
523537
- image_templates:
524538
- "docker.io/aquasec/starboard-operator:{{ .Version }}-ubi9-fips-ppc64le"
539+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-fips-ppc64le"
525540
use: buildx
526541
goos: linux
527542
dockerfile: build/starboard-operator/Dockerfile.fips.ubi9
@@ -542,6 +557,7 @@ dockers:
542557
- LICENSE
543558
- image_templates:
544559
- "docker.io/aquasec/starboard-operator:{{ .Version }}-fips-amd64"
560+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-fips-amd64"
545561
use: buildx
546562
goos: linux
547563
dockerfile: build/starboard-operator/Dockerfile.fips
@@ -560,6 +576,7 @@ dockers:
560576
- "--platform=linux/amd64"
561577
- image_templates:
562578
- "docker.io/aquasec/starboard-operator:{{ .Version }}-fips-arm64"
579+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-fips-arm64"
563580
use: buildx
564581
goos: linux
565582
dockerfile: build/starboard-operator/Dockerfile.fips
@@ -578,6 +595,7 @@ dockers:
578595
- "--platform=linux/arm64"
579596
- image_templates:
580597
- "docker.io/aquasec/starboard-operator:{{ .Version }}-fips-s390x"
598+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-fips-s390x"
581599
use: buildx
582600
goos: linux
583601
dockerfile: build/starboard-operator/Dockerfile.fips
@@ -596,6 +614,7 @@ dockers:
596614
- "--platform=linux/s390x"
597615
- image_templates:
598616
- "docker.io/aquasec/starboard-operator:{{ .Version }}-fips-ppc64le"
617+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-fips-ppc64le"
599618
use: buildx
600619
goos: linux
601620
dockerfile: build/starboard-operator/Dockerfile.fips
@@ -655,3 +674,35 @@ docker_manifests:
655674
- name_template: "aquasec/starboard-scanner-aqua:{{ .Version }}"
656675
image_templates:
657676
- "aquasec/starboard-scanner-aqua:{{ .Version }}-amd64"
677+
678+
# Aqua container registry
679+
- name_template: "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard:{{ .Version }}"
680+
image_templates:
681+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard:{{ .Version }}-amd64"
682+
- name_template: "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}"
683+
image_templates:
684+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-amd64"
685+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-arm64"
686+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-s390x"
687+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ppc64le"
688+
- name_template: "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-fips"
689+
image_templates:
690+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-fips-amd64"
691+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-fips-arm64"
692+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-fips-s390x"
693+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-fips-ppc64le"
694+
- name_template: "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9"
695+
image_templates:
696+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-amd64"
697+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-arm64"
698+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-s390x"
699+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-ppc64le"
700+
- name_template: "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-fips"
701+
image_templates:
702+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-fips-amd64"
703+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-fips-arm64"
704+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-fips-s390x"
705+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-operator:{{ .Version }}-ubi9-fips-ppc64le"
706+
- name_template: "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-scanner-aqua:{{ .Version }}"
707+
image_templates:
708+
- "{{ .Env.AQUSEC_ACR_REGISTRY_NAME }}/starboard-scanner-aqua:{{ .Version }}-amd64"

0 commit comments

Comments
 (0)