Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix detect-secret tagging and also publish versioned UBI-images #88

Merged
merged 2 commits into from
May 10, 2022
Merged

Fix detect-secret tagging and also publish versioned UBI-images #88

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d31fe3d
Fix detect-secret tagging and also publish versioned UBI-images
May 10, 2022
65f3464
fix review issues: var rename and add target prereq
May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 39 additions & 13 deletions Makefile.ibm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ DOCKER_REGISTRY_DOCKERHUB := registry.hub.docker.com
DOCKER_USER_DOCKERHUB := $(DOCKER_HUB_USERNAME)
DOCKER_PASS_DOCKERHUB := $(DOCKER_HUB_API_KEY)

DOCKER_IMAGES := detect-secrets detect-secrets-hook
DOCKER_IMAGES_TAGGED := detect-secrets detect-secrets:redhat-ubi detect-secrets:redhat-ubi-custom detect-secrets-hook
DOCKER_IMAGES_TO_TAG := detect-secrets detect-secrets-hook
DOCKER_IMAGES_TO_TRIVY := detect-secrets detect-secrets-hook detect-secrets:redhat-ubi detect-secrets:redhat-ubi-custom
tefiggins marked this conversation as resolved.
Show resolved Hide resolved
DOCKER_IMAGES_TO_PUBLISH :=
DOCKER_REGISTRIES := $(DOCKER_REGISTRY_ICR) $(DOCKER_REGISTRY_ART) $(DOCKER_REGISTRY_DOCKERHUB)

IMAGE_NAME :=
Expand Down Expand Up @@ -53,7 +54,7 @@ setup-trivy:
tar zxvf /tmp/trivy.tar.gz -C $(dir $(TRIVY)) trivy

docker-quality-images:
for image_name in $(DOCKER_IMAGES_TAGGED) ; do \
for image_name in $(DOCKER_IMAGES_TO_TRIVY) ; do \
$(TRIVY) image --exit-code 1 --ignore-unfixed $(DOCKER_DOMAIN_LOCAL)/$*$${image_name}; \
done \

Expand All @@ -77,12 +78,26 @@ 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
for image_name in $(DOCKER_IMAGES_TAGGED) ; do \
for registry in $(DOCKER_REGISTRIES) ; do \
$(MAKE) docker-publish-image \
IMAGE_NAME=$${image_name} DOCKER_REGISTRY=$${registry}; \
done \
docker-publish-images:
tefiggins marked this conversation as resolved.
Show resolved Hide resolved
# Tagged UBI images in special way (since they are pre-tagged); these will be the frozen versions for UBI images
if [ -n "$(TRAVIS_TAG)" ]; then \
docker tag $(DOCKER_DOMAIN_LOCAL)/detect-secrets:redhat-ubi $(DOCKER_DOMAIN_LOCAL)/detect-secrets:$(subst +,.,$(TRAVIS_TAG))-redhat-ubi ; \
docker tag $(DOCKER_DOMAIN_LOCAL)/detect-secrets:redhat-ubi-custom $(DOCKER_DOMAIN_LOCAL)/detect-secrets:$(subst +,.,$(TRAVIS_TAG))-redhat-ubi-custom ; \
fi
victoria-miltcheva marked this conversation as resolved.
Show resolved Hide resolved

# Tagged non-UBI images with tags specificied within deploy target based each deploy type
for image_name in $(DOCKER_IMAGES_TO_TAG) ; do \
for image_tag in $(IMAGE_TAGS) ; do \
docker tag $(DOCKER_DOMAIN_LOCAL)/$${image_name} $(DOCKER_DOMAIN_LOCAL)/$${image_name}:$${image_tag} ; \
done \
done

# Publish images to the different Registries; publish list is built within deploy target
for image_name in $(DOCKER_IMAGES_TO_PUBLISH) ; do \
for registry in $(DOCKER_REGISTRIES) ; do \
$(MAKE) docker-publish-image \
IMAGE_NAME=$${image_name} DOCKER_REGISTRY=$${registry}; \
done \
done

docker-publish-image:
Expand Down Expand Up @@ -116,18 +131,29 @@ release:
fi

deploy:
# TRAVIS_TAG needs to be replaced with . to avoid docker tag warning
# TRAVIS_TAG, ex: 0.13.1+ibm.46.dss, the + needs to be replaced with . to avoid docker tag warning
tefiggins marked this conversation as resolved.
Show resolved Hide resolved
if [ -n "$(TRAVIS_TAG)" ]; then \
$(MAKE) docker-publish-images push-tag publish-cos IMAGE_TAGS="$(subst +,.,$(TRAVIS_TAG))"; \
$(MAKE) docker-publish-images push-tag publish-cos IMAGE_TAGS="$(subst +,.,$(TRAVIS_TAG))" \
DOCKER_IMAGES_TO_PUBLISH="detect-secrets:$(subst +,.,$(TRAVIS_TAG)) \
detect-secrets-hook:$(subst +,.,$(TRAVIS_TAG)) \
detect-secrets:$(subst +,.,$(TRAVIS_TAG))-redhat-ubi \
detect-secrets:$(subst +,.,$(TRAVIS_TAG))-redhat-ubi-custom" ; \
fi

# DEBUG_IMAGE_TAG, ex: master-420-id-248741968-time-1648742240
if [ "$(TRAVIS_BRANCH)" == "master" ]; then \
$(MAKE) docker-publish-images sync-branches IMAGE_TAGS="latest $(DEBUG_IMAGE_TAG)"; \
$(MAKE) docker-publish-images sync-branches IMAGE_TAGS="$(DEBUG_IMAGE_TAG)" \
DOCKER_IMAGES_TO_PUBLISH="detect-secrets detect-secrets-hook \
detect-secrets:redhat-ubi detect-secrets:redhat-ubi-custom \
detect-secrets:$(DEBUG_IMAGE_TAG) detect-secrets-hook:$(DEBUG_IMAGE_TAG)" ; \
$(MAKE) release; \
fi

# DEBUG_IMAGE_TAG, ex: dss-416-id-248693152-time-1648674570
tefiggins marked this conversation as resolved.
Show resolved Hide resolved
if [ "$(TRAVIS_BRANCH)" == "dss" ]; then \
$(MAKE) docker-publish-images IMAGE_TAGS="dss-latest $(DEBUG_IMAGE_TAG)"; \
$(MAKE) docker-publish-images IMAGE_TAGS="dss-latest $(DEBUG_IMAGE_TAG)" \
DOCKER_IMAGES_TO_PUBLISH="detect-secrets:$(DEBUG_IMAGE_TAG) detect-secrets-hook:$(DEBUG_IMAGE_TAG) \
detect-secrets:dss-latest detect-secrets-hook:dss-latest" ; \
fi

push-tag:
Expand Down