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

[Securesign-2053] | Swapping builder images to Redhat Brew Registry builder images #350

Merged
merged 3 commits into from
Mar 14, 2025
Merged

[Securesign-2053] | Swapping builder images to Redhat Brew Registry builder images #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbb13f7
Swapping builder images to Redhat Brew Registry builder images
tommyd450 Mar 14, 2025
f292281
Adding -mod=mod
tommyd450 Mar 14, 2025
f149202
Updating build statement within logserver dockerfile
tommyd450 Mar 14, 2025
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
28 changes: 14 additions & 14 deletions Build-clis.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,56 +6,56 @@ updatetree-cross-platform: updatetree-darwin-arm64 updatetree-darwin-amd64 updat

.PHONY: createtree-darwin-arm64
createtree-darwin-arm64: ## Build for mac M1
env CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -v -o createtree-darwin-arm64 -trimpath ./cmd/createtree
env CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -mod=mod -v -o createtree-darwin-arm64 -trimpath ./cmd/createtree

.PHONY: createtree-darwin-amd64
createtree-darwin-amd64: ## Build for Darwin (macOS)
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -v -o createtree-darwin-amd64 -trimpath ./cmd/createtree
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -mod=mod -v -o createtree-darwin-amd64 -trimpath ./cmd/createtree

.PHONY: createtree-linux-amd64
createtree-linux-amd64: ## Build for Linux amd64
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -o createtree-linux-amd64 -trimpath ./cmd/createtree
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod=mod -v -o createtree-linux-amd64 -trimpath ./cmd/createtree

.PHONY: createtree-linux-arm64
createtree-linux-arm64: ## Build for Linux arm64
env CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -v -o createtree-linux-arm64 -trimpath ./cmd/createtree
env CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -mod=mod -v -o createtree-linux-arm64 -trimpath ./cmd/createtree

.PHONY: createtree-linux-ppc64le
createtree-linux-ppc64le: ## Build for Linux ppc64le
env CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -v -o createtree-linux-ppc64le -trimpath ./cmd/createtree
env CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -mod=mod -v -o createtree-linux-ppc64le -trimpath ./cmd/createtree

.PHONY: createtree-linux-s390x
createtree-linux-s390x: ## Build for Linux s390x
env CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -v -o createtree-linux-s390x -trimpath ./cmd/createtree
env CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -mod=mod -v -o createtree-linux-s390x -trimpath ./cmd/createtree

.PHONY: createtree-windows-amd64
createtree-windows-amd64: ## Build for Windows
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -v -o createtree-windows-amd64.exe -trimpath ./cmd/createtree
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -mod=mod -v -o createtree-windows-amd64.exe -trimpath ./cmd/createtree

.PHONY: updatetree-darwin-arm64
updatetree-darwin-arm64: ## Build for mac M1
env CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -v -o updatetree-darwin-arm64 -trimpath ./cmd/updatetree
env CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -mod=mod -v -o updatetree-darwin-arm64 -trimpath ./cmd/updatetree

.PHONY: updatetree-darwin-amd64
updatetree-darwin-amd64: ## Build for Darwin (macOS)
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -v -o updatetree-darwin-amd64 -trimpath ./cmd/updatetree
env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -mod=mod -v -o updatetree-darwin-amd64 -trimpath ./cmd/updatetree

.PHONY: updatetree-linux-amd64
updatetree-linux-amd64: ## Build for Linux amd64
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -o updatetree-linux-amd64 -trimpath ./cmd/updatetree
env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod=mod -v -o updatetree-linux-amd64 -trimpath ./cmd/updatetree

.PHONY: updatetree-linux-arm64
updatetree-linux-arm64: ## Build for Linux arm64
env CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -v -o updatetree-linux-arm64 -trimpath ./cmd/updatetree
env CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -mod=mod -v -o updatetree-linux-arm64 -trimpath ./cmd/updatetree

.PHONY: updatetree-linux-ppc64le
updatetree-linux-ppc64le: ## Build for Linux ppc64le
env CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -v -o updatetree-linux-ppc64le -trimpath ./cmd/updatetree
env CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -mod=mod -v -o updatetree-linux-ppc64le -trimpath ./cmd/updatetree

.PHONY: updatetree-linux-s390x
updatetree-linux-s390x: ## Build for Linux s390x
env CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -v -o updatetree-linux-s390x -trimpath ./cmd/updatetree
env CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -mod=mod -v -o updatetree-linux-s390x -trimpath ./cmd/updatetree

.PHONY: updatetree-windows-amd64
updatetree-windows-amd64: ## Build for Windows
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -v -o updatetree-windows-amd64.exe -trimpath ./cmd/updatetree
env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -mod=mod -v -o updatetree-windows-amd64.exe -trimpath ./cmd/updatetree
2 changes: 1 addition & 1 deletion Dockerfile.createtree.rh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi9/go-toolset@sha256:cbc354aed85c826d3b6d6d16250a46b1af0bf5805d109b200bc1998119c8ed29 AS build-env
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:6a4a05d24acecde63d9c7c8c986ad9e5e20da2c2ce30312b328ed771736e7a1f AS build-env
ENV APP_ROOT=/opt/app-root
ENV GOPATH=$APP_ROOT
ENV CGO_ENABLED=false
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.logserver.rh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi9/go-toolset@sha256:cbc354aed85c826d3b6d6d16250a46b1af0bf5805d109b200bc1998119c8ed29 AS builder
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:6a4a05d24acecde63d9c7c8c986ad9e5e20da2c2ce30312b328ed771736e7a1f AS builder
ENV APP_ROOT=/opt/app-root
ENV GOPATH=$APP_ROOT
ENV CGO_ENABLED=false
Expand All @@ -12,7 +12,7 @@ RUN git config --global --add safe.directory /opt/app-root/src
# Add source code
ADD ./ $APP_ROOT/src/

RUN go build -v ./cmd/trillian_log_server
RUN go build -mod=mod -v ./cmd/trillian_log_server

# Multi-Stage production build
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:8b314e254e9ab9a7a08b675fcfd3ed66a2943eeda7b26395210d451569976b9b AS deploy
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.logsigner.rh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi9/go-toolset@sha256:cbc354aed85c826d3b6d6d16250a46b1af0bf5805d109b200bc1998119c8ed29 AS builder
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:6a4a05d24acecde63d9c7c8c986ad9e5e20da2c2ce30312b328ed771736e7a1f AS builder
ENV APP_ROOT=/opt/app-root
ENV GOPATH=$APP_ROOT
ENV CGO_ENABLED=false
Expand All @@ -12,7 +12,7 @@ RUN git config --global --add safe.directory /opt/app-root/src
# Add source code
ADD ./ $APP_ROOT/src/

RUN go build -v ./cmd/trillian_log_signer
RUN go build -mod=mod -v ./cmd/trillian_log_signer

# Multi-Stage production build
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:8b314e254e9ab9a7a08b675fcfd3ed66a2943eeda7b26395210d451569976b9b AS deploy
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.updatetree.rh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi9/go-toolset@sha256:cbc354aed85c826d3b6d6d16250a46b1af0bf5805d109b200bc1998119c8ed29 AS build-env
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:6a4a05d24acecde63d9c7c8c986ad9e5e20da2c2ce30312b328ed771736e7a1f AS build-env
ENV APP_ROOT=/opt/app-root
ENV GOPATH=$APP_ROOT
ENV CGO_ENABLED=false
Expand Down
Loading