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

ci: fix gator image for ghcr #3700

Merged
merged 1 commit into from
Nov 14, 2024
Merged

ci: fix gator image for ghcr #3700

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,26 +426,26 @@ docker-buildx-dev: docker-buildx-builder
$(if $(filter true,$(PUSH_TO_GHCR)),-t $(GHCR_REPOSITORY):$(DEV_TAG)) \
$(if $(filter true,$(PUSH_TO_GHCR)),-t $(GHCR_REPOSITORY):dev) .

docker-buildx-crds-dev: build-crds docker-buildx-builder
docker-buildx-release: docker-buildx-builder
docker buildx build \
$(_ATTESTATIONS) \
--build-arg LDFLAGS=${LDFLAGS} \
--platform="$(PLATFORM)" \
--output=$(OUTPUT_TYPE) \
-t $(CRD_REPOSITORY):$(DEV_TAG) \
-t $(CRD_REPOSITORY):dev \
$(if $(filter true,$(PUSH_TO_GHCR)),-t $(GHCR_CRD_REPOSITORY):$(DEV_TAG)) \
$(if $(filter true,$(PUSH_TO_GHCR)),-t $(GHCR_CRD_REPOSITORY):dev) \
-f crd.Dockerfile .staging/crds/
-t $(REPOSITORY):$(VERSION) \
$(if $(filter true,$(PUSH_TO_GHCR)),-t $(GHCR_REPOSITORY):$(VERSION)) .

docker-buildx-release: docker-buildx-builder
docker-buildx-crds-dev: build-crds docker-buildx-builder
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This rule is getting swapped with docker-buildx-release and vice versa without any change.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea i just shuffled the makefile so it goes dev -> release for each image

docker buildx build \
$(_ATTESTATIONS) \
--build-arg LDFLAGS=${LDFLAGS} \
--platform="$(PLATFORM)" \
--output=$(OUTPUT_TYPE) \
-t $(REPOSITORY):$(VERSION) \
$(if $(filter true,$(PUSH_TO_GHCR)),-t $(GHCR_REPOSITORY):$(VERSION)) .
-t $(CRD_REPOSITORY):$(DEV_TAG) \
-t $(CRD_REPOSITORY):dev \
$(if $(filter true,$(PUSH_TO_GHCR)),-t $(GHCR_CRD_REPOSITORY):$(DEV_TAG)) \
$(if $(filter true,$(PUSH_TO_GHCR)),-t $(GHCR_CRD_REPOSITORY):dev) \
-f crd.Dockerfile .staging/crds/

docker-buildx-crds-release: build-crds docker-buildx-builder
docker buildx build \
Expand All @@ -466,8 +466,8 @@ docker-buildx-gator-dev: docker-buildx-builder
--output=$(OUTPUT_TYPE) \
-t ${GATOR_REPOSITORY}:${DEV_TAG} \
-t ${GATOR_REPOSITORY}:dev \
$(if $(filter true,$(PUSH_TO_GHCR)),-t ${GHCR_REPOSITORY}:${DEV_TAG}) \
$(if $(filter true,$(PUSH_TO_GHCR)),-t ${GHCR_REPOSITORY}:dev) \
$(if $(filter true,$(PUSH_TO_GHCR)),-t ${GHCR_GATOR_REPOSITORY}:${DEV_TAG}) \
$(if $(filter true,$(PUSH_TO_GHCR)),-t ${GHCR_GATOR_REPOSITORY}:dev) \
-f gator.Dockerfile .

docker-buildx-gator-release: docker-buildx-builder
Expand All @@ -477,7 +477,7 @@ docker-buildx-gator-release: docker-buildx-builder
--platform="$(PLATFORM)" \
--output=$(OUTPUT_TYPE) \
-t ${GATOR_REPOSITORY}:${VERSION} \
$(if $(filter true,$(PUSH_TO_GHCR)),-t ${GHCR_REPOSITORY}:${VERSION}) \
$(if $(filter true,$(PUSH_TO_GHCR)),-t ${GHCR_GATOR_REPOSITORY}:${VERSION}) \
-f gator.Dockerfile .

# Update manager_image_patch.yaml with image tag
Expand Down
Loading