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.

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

Version commit hash #191

Merged
merged 29 commits into from
Aug 26, 2024
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2dab094
added check dirty script
ehearneRedHat Jul 15, 2024
4e75e96
added target level vars .
ehearneRedHat Jul 15, 2024
523b2fc
added ldflag strings
ehearneRedHat Jul 15, 2024
9c3630c
added docker args
ehearneRedHat Jul 15, 2024
88c098d
added target level args + docker envs
ehearneRedHat Jul 18, 2024
5a3d19d
added build args to workflow
ehearneRedHat Jul 22, 2024
1a62830
remove unnecessary var
ehearneRedHat Jul 23, 2024
504aa0f
Merge branch 'main' into version-commit-hash
ehearneRedHat Jul 23, 2024
24e55c8
change commit to gitsha args + envs
ehearneRedHat Jul 29, 2024
650b73a
change commit target vars to gitsha target vars
ehearneRedHat Jul 29, 2024
613b189
change commit build args to gitsha build args
ehearneRedHat Jul 29, 2024
b335047
move version to separate file + commit change to gitsha
ehearneRedHat Jul 29, 2024
e5736c4
Merge branch 'version-commit-hash' of github.com:Kuadrant/dns-operato…
ehearneRedHat Jul 29, 2024
4b8832b
Merge branch 'main' into version-commit-hash
ehearneRedHat Jul 29, 2024
622abb9
added func printControllerMetaInfo()
ehearneRedHat Jul 29, 2024
4400824
new test tools for pkg/log/log_test.go
ehearneRedHat Jul 29, 2024
1f642d3
import new log go file + brought over dns-operator's log pkg
ehearneRedHat Jul 29, 2024
893de4f
add copy for new log pkg
ehearneRedHat Jul 29, 2024
22f2a57
added new changes to go.mod
ehearneRedHat Jul 29, 2024
35fc04b
add new line for import
ehearneRedHat Jul 29, 2024
704035e
move version to internal/version
ehearneRedHat Aug 9, 2024
fe5fa3a
version now copy in internal/
ehearneRedHat Aug 9, 2024
d348e42
revert logger config
ehearneRedHat Aug 9, 2024
075768f
move printcontrollermetainfo() to below setuplogger
ehearneRedHat Aug 9, 2024
65bd458
remove copy pkg
ehearneRedHat Aug 9, 2024
ef9ad74
fix from casing issue
ehearneRedHat Aug 9, 2024
9c4ef60
Merge branch 'main' into version-commit-hash
ehearneRedHat Aug 9, 2024
c0cb348
add build info string to controllermetainfo
ehearneRedHat Aug 26, 2024
03cc372
Merge branch 'main' of github.com:Kuadrant/dns-operator into version-…
ehearneRedHat Aug 26, 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
Prev Previous commit
Next Next commit
added docker args
Signed-off-by: ehearneredhat <ehearne@redhat.com>
ehearneRedHat committed Jul 23, 2024
commit 9c3630cc37c4c933189f4a9b50ec53724529311d
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -2,6 +2,11 @@
FROM golang:1.21 as builder
ARG TARGETOS
ARG TARGETARCH
ARG DNS_OPERATOR_VERSION
ARG COMMIT
ARG DIRTY

# TODO env var implementation here

WORKDIR /workspace
# Copy the Go Modules manifests
@@ -21,7 +26,7 @@ COPY internal/ internal/
# was called. For example, if we call make docker-build in a local env which has the Apple Silicon M1 SO
# the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
# by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o manager cmd/main.go
RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -ldflags "-X main.version=${DNS_OPERATOR_VERSION} -X main.commit=${COMMIT} -X main.dirty=${DIRTY}" -a -o manager cmd/main.go

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details