Skip to content

Commit 29b9b24

Browse files
tommyd450tommyd450
authoredMar 14, 2025··
[Securesign-2053] | Swapping builder images to Redhat Brew Registry builder images (#350)
* Swapping builder images to Redhat Brew Registry builder images * Adding -mod=mod * Updating build statement within logserver dockerfile
1 parent 29399c5 commit 29b9b24

5 files changed

+20
-20
lines changed
 

‎Build-clis.mak

+14-14
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,56 @@ updatetree-cross-platform: updatetree-darwin-arm64 updatetree-darwin-amd64 updat
66

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

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

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

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

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

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

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

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

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

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

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

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

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

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

‎Dockerfile.createtree.rh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/go-toolset@sha256:cbc354aed85c826d3b6d6d16250a46b1af0bf5805d109b200bc1998119c8ed29 AS build-env
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:6a4a05d24acecde63d9c7c8c986ad9e5e20da2c2ce30312b328ed771736e7a1f AS build-env
22
ENV APP_ROOT=/opt/app-root
33
ENV GOPATH=$APP_ROOT
44
ENV CGO_ENABLED=false

‎Dockerfile.logserver.rh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/go-toolset@sha256:cbc354aed85c826d3b6d6d16250a46b1af0bf5805d109b200bc1998119c8ed29 AS builder
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:6a4a05d24acecde63d9c7c8c986ad9e5e20da2c2ce30312b328ed771736e7a1f AS builder
22
ENV APP_ROOT=/opt/app-root
33
ENV GOPATH=$APP_ROOT
44
ENV CGO_ENABLED=false
@@ -12,7 +12,7 @@ RUN git config --global --add safe.directory /opt/app-root/src
1212
# Add source code
1313
ADD ./ $APP_ROOT/src/
1414

15-
RUN go build -v ./cmd/trillian_log_server
15+
RUN go build -mod=mod -v ./cmd/trillian_log_server
1616

1717
# Multi-Stage production build
1818
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:8b314e254e9ab9a7a08b675fcfd3ed66a2943eeda7b26395210d451569976b9b AS deploy

‎Dockerfile.logsigner.rh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/go-toolset@sha256:cbc354aed85c826d3b6d6d16250a46b1af0bf5805d109b200bc1998119c8ed29 AS builder
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:6a4a05d24acecde63d9c7c8c986ad9e5e20da2c2ce30312b328ed771736e7a1f AS builder
22
ENV APP_ROOT=/opt/app-root
33
ENV GOPATH=$APP_ROOT
44
ENV CGO_ENABLED=false
@@ -12,7 +12,7 @@ RUN git config --global --add safe.directory /opt/app-root/src
1212
# Add source code
1313
ADD ./ $APP_ROOT/src/
1414

15-
RUN go build -v ./cmd/trillian_log_signer
15+
RUN go build -mod=mod -v ./cmd/trillian_log_signer
1616

1717
# Multi-Stage production build
1818
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:8b314e254e9ab9a7a08b675fcfd3ed66a2943eeda7b26395210d451569976b9b AS deploy

‎Dockerfile.updatetree.rh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/go-toolset@sha256:cbc354aed85c826d3b6d6d16250a46b1af0bf5805d109b200bc1998119c8ed29 AS build-env
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23@sha256:6a4a05d24acecde63d9c7c8c986ad9e5e20da2c2ce30312b328ed771736e7a1f AS build-env
22
ENV APP_ROOT=/opt/app-root
33
ENV GOPATH=$APP_ROOT
44
ENV CGO_ENABLED=false

0 commit comments

Comments
 (0)
Please sign in to comment.