Skip to content

Commit fffebdf

Browse files
tbavelierlevan-m
andauthored
Add gitlab workflows to publish fips images (#1732) (#1738)
* Add gitlab workflows to publish fips images * Add back -w -s ldflags Co-authored-by: levan-m <[email protected]>
1 parent 946f7f4 commit fffebdf

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

.gitlab-ci.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,12 @@ publish_public_tag:
265265
IMG_DESTINATIONS_REGEX_REPL: ':'
266266
IMG_SIGNING: "false"
267267

268+
publish_public_tag_fips:
269+
extends: publish_public_tag
270+
variables:
271+
IMG_SOURCES: $BUILD_DOCKER_REGISTRY/$PROJECTNAME:$CI_COMMIT_TAG-fips-amd64,$BUILD_DOCKER_REGISTRY/$PROJECTNAME:$CI_COMMIT_TAG-fips-arm64
272+
IMG_DESTINATIONS: operator:$CI_COMMIT_TAG-fips
273+
268274
publish_redhat_public_tag:
269275
stage: release
270276
rules:
@@ -283,6 +289,12 @@ publish_redhat_public_tag:
283289
IMG_REGISTRIES: redhat-operator
284290
IMG_SIGNING: "false"
285291

292+
publish_redhat_public_tag_fips:
293+
extends: publish_redhat_public_tag
294+
variables:
295+
IMG_SOURCES: $BUILD_DOCKER_REGISTRY/$PROJECTNAME:$CI_COMMIT_TAG-fips-amd64,$BUILD_DOCKER_REGISTRY/$PROJECTNAME:$CI_COMMIT_TAG-fips-arm64
296+
IMG_DESTINATIONS: $RH_PARTNER_PROJECT_ID:$CI_COMMIT_TAG-fips
297+
286298
publish_public_latest:
287299
stage: release
288300
rules:
@@ -298,6 +310,12 @@ publish_public_latest:
298310
IMG_DESTINATIONS: operator:latest
299311
IMG_SIGNING: "false"
300312

313+
publish_public_latest_fips:
314+
extends: publish_public_latest
315+
variables:
316+
IMG_SOURCES: $BUILD_DOCKER_REGISTRY/$PROJECTNAME:$CI_COMMIT_TAG-fips-amd64,$BUILD_DOCKER_REGISTRY/$PROJECTNAME:$CI_COMMIT_TAG-fips-arm64
317+
IMG_DESTINATIONS: operator:latest-fips
318+
301319
publish_redhat_public_latest:
302320
stage: release
303321
rules:
@@ -314,6 +332,12 @@ publish_redhat_public_latest:
314332
IMG_REGISTRIES: redhat-operator
315333
IMG_SIGNING: "false"
316334

335+
publish_redhat_public_latest_fips:
336+
extends: publish_redhat_public_latest
337+
variables:
338+
IMG_SOURCES: $BUILD_DOCKER_REGISTRY/$PROJECTNAME:$CI_COMMIT_TAG-fips-amd64,$BUILD_DOCKER_REGISTRY/$PROJECTNAME:$CI_COMMIT_TAG-fips-arm64
339+
IMG_DESTINATIONS: $RH_PARTNER_PROJECT_ID:latest-fips
340+
317341
trigger_internal_operator_image:
318342
stage: release
319343
rules:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ IMG_VERSION?=$(if $(VERSION),$(VERSION),latest)
1414
VERSION?=$(if $(GIT_TAG),$(GIT_TAG),$(TAG_HASH))
1515
GIT_COMMIT?=$(shell git rev-parse HEAD)
1616
DATE=$(shell date +%Y-%m-%d/%H:%M:%S )
17-
LDFLAGS=-X ${BUILDINFOPKG}.Commit=${GIT_COMMIT} -X ${BUILDINFOPKG}.Version=${VERSION} -X ${BUILDINFOPKG}.BuildTime=${DATE}
17+
LDFLAGS=-w -s -X ${BUILDINFOPKG}.Commit=${GIT_COMMIT} -X ${BUILDINFOPKG}.Version=${VERSION} -X ${BUILDINFOPKG}.BuildTime=${DATE}
1818
CHANNELS=stable
1919
DEFAULT_CHANNEL=stable
2020
GOARCH?=

0 commit comments

Comments
 (0)