diff --git a/redhat/overlays/Dockerfile b/redhat/overlays/Dockerfile index feb9a2c85..90f00366f 100644 --- a/redhat/overlays/Dockerfile +++ b/redhat/overlays/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1 AS builder +FROM registry.access.redhat.com/ubi9/go-toolset@sha256:c3a9c5c7fb226f6efcec2424dd30c38f652156040b490c9eca5ac5b61d8dc3ca AS builder ENV APP_ROOT=/opt/app-root ENV GOPATH=$APP_ROOT @@ -31,13 +31,13 @@ RUN CGO_ENABLED=0 go build -gcflags "all=-N -l" -ldflags "${SERVER_LDFLAGS}" -o RUN go test -c -ldflags "${SERVER_LDFLAGS}" -cover -covermode=count -coverpkg=./... -o rekor-server_test ./cmd/rekor-server # debug compile options & debugger -FROM registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1 as debug +FROM registry.access.redhat.com/ubi9/go-toolset@sha256:c3a9c5c7fb226f6efcec2424dd30c38f652156040b490c9eca5ac5b61d8dc3ca as debug RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.0 # overwrite server and include debugger COPY --from=builder /opt/app-root/src/rekor-server_debug /usr/local/bin/rekor-server -FROM registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1 as test +FROM registry.access.redhat.com/ubi9/go-toolset@sha256:c3a9c5c7fb226f6efcec2424dd30c38f652156040b490c9eca5ac5b61d8dc3ca as test USER root @@ -56,7 +56,7 @@ RUN mkdir -p /var/run/attestations && \ COPY --from=builder /opt/app-root/src/rekor-server_test /usr/local/bin/rekor-server # Multi-Stage production build -FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:b40f52aa68b29634ff45429ee804afbaa61b33de29ae775568933c71610f07a4 as deploy +FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:7d1ea7ac0c6f464dac7bae6994f1658172bf6068229f40778a513bc90f47e624 as deploy LABEL description="Rekor aims to provide an immutable, tamper-resistant ledger of metadata generated within a software project’s supply chain." LABEL io.k8s.description="Rekor-Server provides a tamper resistant ledger." diff --git a/redhat/overlays/Dockerfile.backfill-redis b/redhat/overlays/Dockerfile.backfill-redis index 40b5694c6..866cec6b4 100644 --- a/redhat/overlays/Dockerfile.backfill-redis +++ b/redhat/overlays/Dockerfile.backfill-redis @@ -1,12 +1,12 @@ #Build stage -FROM registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1 AS build-env +FROM registry.access.redhat.com/ubi9/go-toolset@sha256:c3a9c5c7fb226f6efcec2424dd30c38f652156040b490c9eca5ac5b61d8dc3ca AS build-env USER root RUN git config --global --add safe.directory /opt/app-root/src COPY . . RUN make backfill-redis #Install stage -FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:b40f52aa68b29634ff45429ee804afbaa61b33de29ae775568933c71610f07a4 +FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:7d1ea7ac0c6f464dac7bae6994f1658172bf6068229f40778a513bc90f47e624 COPY --from=build-env /opt/app-root/src/backfill-redis /usr/local/bin/backfill-redis WORKDIR /opt/app-root/src/home diff --git a/redhat/overlays/Dockerfile.cli b/redhat/overlays/Dockerfile.cli index e79ba8880..0d0129429 100644 --- a/redhat/overlays/Dockerfile.cli +++ b/redhat/overlays/Dockerfile.cli @@ -1,5 +1,5 @@ #Build stage -FROM registry.access.redhat.com/ubi9/go-toolset@sha256:82d9bc5d3ceb43635288880f26207201e55d1c688a60ebbfff4f54d4963a62a1 AS build-env +FROM registry.access.redhat.com/ubi9/go-toolset@sha256:c3a9c5c7fb226f6efcec2424dd30c38f652156040b490c9eca5ac5b61d8dc3ca AS build-env USER root RUN git config --global --add safe.directory /opt/app-root/src COPY . . @@ -16,7 +16,7 @@ RUN git stash && \ gzip rekor_cli_windows_amd64.exe #Install stage -FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:b40f52aa68b29634ff45429ee804afbaa61b33de29ae775568933c71610f07a4 +FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:7d1ea7ac0c6f464dac7bae6994f1658172bf6068229f40778a513bc90f47e624 LABEL description="Rekor-cli is a command line interface (CLI) tool used to interact with a rekor server." LABEL io.k8s.description="Rekor-cli is a command line interface (CLI) tool used to interact with a rekor server."