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

Create Containerfile.operator files in preparation to move to RHTAP #102

Merged
merged 2 commits into from
May 8, 2024
Merged

Create Containerfile.operator files in preparation to move to RHTAP #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a760db
Create Containerfile.operator files in preparation to move to RHTAP
subbarao-meduri May 4, 2024
1344840
refactor to override specific targets
subbarao-meduri May 7, 2024
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
22 changes: 22 additions & 0 deletions Containerfile.operator
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Copyright Contributors to the Open Cluster Management project
# Licensed under the Apache License 2.0

FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS builder

WORKDIR $GOPATH/src/github.com/thanos-io/thanos

COPY . $GOPATH/src/github.com/thanos-io/thanos

RUN git update-index --refresh; make build -f Makefile.rhtap

# -----------------------------------------------------------------------------

FROM registry.access.redhat.com/ubi8/ubi-minimal:latest

LABEL maintainer="The ACM Thanos maintainers"

COPY --from=builder /go/bin/thanos /bin/thanos

RUN microdnf update -y && microdnf clean all

ENTRYPOINT [ "/bin/thanos" ]
23 changes: 23 additions & 0 deletions Makefile.rhtap
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

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

@subbarao-meduri how will we maintain this Makefile? What do we have to do when it diverges from upstream? Can we not duplicate everything but only extend the make targets that we need?

Copy link
Author

Choose a reason for hiding this comment

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

@douglascamata I re-did the new Makefile targets to only override specific targets while including original Makefile. This should make it easier to maintain. Please review.

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
include Makefile

# Override build, crossbuild targets from Makefile
# to use promu to build dynamic binaries
.PHONY: build
build: ## Builds Thanos binary using `promu`.
build: check-git deps $(PROMU)
@echo ">> building Thanos binary in $(PREFIX)"
@go mod vendor && $(PROMU) -c ".promu.prow.yaml" build -v --cgo --prefix $(PREFIX)

GIT_BRANCH=$(shell $(GIT) rev-parse --abbrev-ref HEAD)
.PHONY: crossbuild
crossbuild: ## Builds all binaries for all platforms.
ifeq ($(GIT_BRANCH), main)
crossbuild: | $(PROMU)
@echo ">> crossbuilding all binaries"
# we only care about below two for the main branch
@go mod vendor && $(PROMU) -c ".promu.prow.yaml" crossbuild -v --cgo -p linux/amd64
else
crossbuild: | $(PROMU)
@echo ">> crossbuilding all binaries"
@go mod vendor && $(PROMU) -c ".promu.prow.yaml" crossbuild -v --cgo
endif
Loading