Skip to content

Commit

Permalink
Revert "No more Artifactory support"
Browse files Browse the repository at this point in the history
This reverts commit 0a94917.

Signed-off-by: Victoria Miltcheva <[email protected]>
  • Loading branch information
victoria-miltcheva committed Sep 26, 2023
1 parent 0a94917 commit ec095bc
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Makefile.ibm
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@ DOCKER_REGISTRY_ICR := icr.io
DOCKER_USER_ICR := iamapikey
DOCKER_PASS_ICR := $(IBM_CLOUD_API_KEY)

DOCKER_REGISTRY_ART := txo-toolbox-team-docker-local.artifactory.swg-devops.com
DOCKER_USER_ART := $(ART_USER_ID)
DOCKER_PASS_ART := $(ART_API_KEY)

DOCKER_IMAGES_TO_TAG := detect-secrets detect-secrets-hook
DOCKER_IMAGES_TO_SCAN := detect-secrets detect-secrets-hook detect-secrets:redhat-ubi detect-secrets:redhat-ubi-custom
DOCKER_IMAGES_TO_PUBLISH :=
DOCKER_REGISTRIES := $(DOCKER_REGISTRY_ICR)
DOCKER_REGISTRIES := $(DOCKER_REGISTRY_ICR) $(DOCKER_REGISTRY_ART)

IMAGE_NAME :=
DOCKER_REGISTRY :=
Expand Down Expand Up @@ -83,6 +87,7 @@ docker-build-images:
done

docker-login:
@echo $(DOCKER_PASS_ART) | docker login -u $(DOCKER_USER_ART) --password-stdin $(DOCKER_REGISTRY_ART);
@echo $(DOCKER_PASS_ICR) | docker login -u $(DOCKER_USER_ICR) --password-stdin $(DOCKER_REGISTRY_ICR);

docker-publish-images: docker-login
Expand Down Expand Up @@ -118,6 +123,7 @@ docker-publish-image:
$(COSIGN) verify --key env://COSIGN_PUBLIC_KEY "$(DOCKER_REGISTRY)/$(DOCKER_DOMAIN)/$(IMAGE_NAME)";

cosign-login:
@echo $(DOCKER_PASS_ART) | $(COSIGN) login -u $(DOCKER_USER_ART) --password-stdin $(DOCKER_REGISTRY_ART); \
@echo $(DOCKER_PASS_ICR) | $(COSIGN) login -u $(DOCKER_USER_ICR) --password-stdin $(DOCKER_REGISTRY_ICR);

publish-cos:
Expand Down

0 comments on commit ec095bc

Please sign in to comment.