Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Dockerfile.cli-stack.rh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.redhat.io/ubi9/go-toolset:9.8-1784090680@sha256:e1ff4f548dfca084c2318d11dccd7d30a75c81a3a4fd8abcebc42ea42dd683e8 AS build-cross-platform
FROM registry.redhat.io/ubi9/go-toolset:9.8-1785791459@sha256:46376c6723c3a4961a165c2768461e7fac48a79932cdde0a6e6a57724ef61ba0 AS build-cross-platform
ENV APP_ROOT=/opt/app-root \
GOPATH=/opt/app-root \
CGO_ENABLED=0 \
Expand Down Expand Up @@ -26,7 +26,7 @@ FROM --platform=linux/arm64 quay.io/securesign/trillian-updatetree@sha256:b851
FROM --platform=linux/ppc64le quay.io/securesign/trillian-updatetree@sha256:7eccebd2a9c2829b6e0af8d75db7d1a4852c4d35401886c5eeaf7625c7b4e6fe AS updatetree-ppc64le
FROM --platform=linux/s390x quay.io/securesign/trillian-updatetree@sha256:fe921d5f1343cbe67d73e542c9204fd3c18a2d2f54687d9d2db626604dcedeb6 AS updatetree-s390x

FROM registry.redhat.io/ubi9/go-toolset:9.8-1784090680@sha256:e1ff4f548dfca084c2318d11dccd7d30a75c81a3a4fd8abcebc42ea42dd683e8 AS packager
FROM registry.redhat.io/ubi9/go-toolset:9.8-1785791459@sha256:46376c6723c3a4961a165c2768461e7fac48a79932cdde0a6e6a57724ef61ba0 AS packager
USER root
RUN mkdir -p /binaries

Expand Down Expand Up @@ -93,7 +93,7 @@ RUN tar -czf /binaries/updatetree_windows_amd64.tar.gz -C /tmp updatetree.exe &&
RUN chmod -R a+rX /binaries

# Final minimal image with all binaries
FROM registry.redhat.io/ubi9/ubi-micro:9.8-1782840931@sha256:35de56a9413112f1474e392ebc35e0cf6f0fb484c8e8877bbae59b513694b41f
FROM registry.redhat.io/ubi9/ubi-micro:9.8-1784702951@sha256:b1e86b97028b8fcfb6d85f997c39e6b6b67496163ef8d80d243220a4918e8bef

LABEL description="Flat image containing createtree and updatetree CLI binaries for all platforms and architectures"
LABEL io.k8s.description="Flat image containing createtree and updatetree CLI binaries for all platforms and architectures"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.createtree.rh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.redhat.io/ubi9/go-toolset:9.8-1784090680@sha256:e1ff4f548dfca084c2318d11dccd7d30a75c81a3a4fd8abcebc42ea42dd683e8 AS build
FROM registry.redhat.io/ubi9/go-toolset:9.8-1785791459@sha256:46376c6723c3a4961a165c2768461e7fac48a79932cdde0a6e6a57724ef61ba0 AS build
ENV APP_ROOT=/opt/app-root \
GOPATH=/opt/app-root \
CGO_ENABLED=0 \
Expand All @@ -16,7 +16,7 @@ RUN go mod download && \
go build -mod=mod -tags 'postgresql,mysql,k8s,no_openssl' -o createtree -trimpath ./cmd/createtree

# Multi-Stage production build
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:062c52ff973065752b0965787649db2bcf551a6c727a00e95a3eb42cebadbdab AS deploy
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:48fa5d8cda7fc00d270d8747c3eaa54ae196f0820d8540074a9c8c61d5e3056f AS deploy

# Add license file
COPY LICENSE /licenses/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.database.rh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.redhat.io/rhel9/mariadb-105@sha256:f4223f6a3fb592a4d406acafc7f8d4079162628aa0926c9652284a15b1041311
FROM registry.redhat.io/rhel9/mariadb-105@sha256:94c773e40f7373cdc48a379fda80a3d7a17a206858d112f5238f82e62e4f6f83

USER root

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.logserver.rh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.redhat.io/ubi9/go-toolset:9.8-1784090680@sha256:e1ff4f548dfca084c2318d11dccd7d30a75c81a3a4fd8abcebc42ea42dd683e8 AS builder
FROM registry.redhat.io/ubi9/go-toolset:9.8-1785791459@sha256:46376c6723c3a4961a165c2768461e7fac48a79932cdde0a6e6a57724ef61ba0 AS builder
ENV APP_ROOT=/opt/app-root
ENV GOPATH=$APP_ROOT
ENV CGO_ENABLED=0
Expand All @@ -17,7 +17,7 @@ RUN go mod edit -godebug=fips140=auto && \
go build -mod=mod -tags 'postgresql,mysql,k8s,no_openssl' -v ./cmd/trillian_log_server

# Multi-Stage production build
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:062c52ff973065752b0965787649db2bcf551a6c727a00e95a3eb42cebadbdab AS deploy
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:48fa5d8cda7fc00d270d8747c3eaa54ae196f0820d8540074a9c8c61d5e3056f AS deploy

# Retrieve the binary from the previous stage
COPY --from=builder /opt/app-root/src/trillian_log_server /
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.logsigner.rh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.redhat.io/ubi9/go-toolset:9.8-1784090680@sha256:e1ff4f548dfca084c2318d11dccd7d30a75c81a3a4fd8abcebc42ea42dd683e8 AS builder
FROM registry.redhat.io/ubi9/go-toolset:9.8-1785791459@sha256:46376c6723c3a4961a165c2768461e7fac48a79932cdde0a6e6a57724ef61ba0 AS builder
ENV APP_ROOT=/opt/app-root
ENV GOPATH=$APP_ROOT
ENV CGO_ENABLED=0
Expand All @@ -17,7 +17,7 @@ RUN go mod edit -godebug=fips140=auto && \
go build -mod=mod -tags 'postgresql,mysql,k8s,no_openssl' -v ./cmd/trillian_log_signer

# Multi-Stage production build
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:062c52ff973065752b0965787649db2bcf551a6c727a00e95a3eb42cebadbdab AS deploy
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:48fa5d8cda7fc00d270d8747c3eaa54ae196f0820d8540074a9c8c61d5e3056f AS deploy

# Retrieve the binary from the previous stage
COPY --from=builder /opt/app-root/src/trillian_log_signer /
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.netcat.rh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:062c52ff973065752b0965787649db2bcf551a6c727a00e95a3eb42cebadbdab
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:48fa5d8cda7fc00d270d8747c3eaa54ae196f0820d8540074a9c8c61d5e3056f

LABEL description="Netcat is a computer networking utility for reading from and writing to network connections using TCP or UDP."
LABEL io.k8s.description="netcat is a computer networking utility for reading from and writing to network connections using TCP or UDP."
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.redis.rh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.redhat.io/rhel9/redis-6@sha256:542e172235f0c71f4fded0bb0c0faba52c564c11c6c315b3783343ddceee99ff
FROM registry.redhat.io/rhel9/redis-6@sha256:8fdc01b115af52a79074669888faafb021313afbd2090a59552c2c6240d0b9ac

LABEL description="Securesign redis is built ontop of rhel9/redis-6 but accepts external connections and runs appendonly mode with full durability."
LABEL io.k8s.description="Securesign redis is built ontop of rhel9/redis-6 but accepts external connections and runs appendonly mode with full durability."
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.updatetree.rh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.redhat.io/ubi9/go-toolset:9.8-1784090680@sha256:e1ff4f548dfca084c2318d11dccd7d30a75c81a3a4fd8abcebc42ea42dd683e8 AS build
FROM registry.redhat.io/ubi9/go-toolset:9.8-1785791459@sha256:46376c6723c3a4961a165c2768461e7fac48a79932cdde0a6e6a57724ef61ba0 AS build
ENV APP_ROOT=/opt/app-root \
GOPATH=/opt/app-root \
CGO_ENABLED=0 \
Expand All @@ -16,7 +16,7 @@ RUN go mod download && \
go build -mod=mod -tags 'postgresql,mysql,k8s,no_openssl' -o updatetree -trimpath ./cmd/updatetree

# Multi-Stage production build
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:062c52ff973065752b0965787649db2bcf551a6c727a00e95a3eb42cebadbdab AS deploy
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:48fa5d8cda7fc00d270d8747c3eaa54ae196f0820d8540074a9c8c61d5e3056f AS deploy

# Add license file
COPY LICENSE /licenses/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/docker/db_server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mysql:9.7@sha256:ae269281abffe401d65f04cb54d45a069a495b8174b9c0a815e502fed7fa0370
FROM mysql:9.7@sha256:257388edf9c84dbc04c763625446d5f3fa6ed60d1b0873bc552c614ba0a7ab4e


# TODO(roger2hk): Uncomment the below OS-level packages patch command as this is a temporary workaround to bypass the mysql8 gpg key rotation issue.
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/docker/db_server/postgresql/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:18.3@sha256:a9abf4275f9e99bff8e6aed712b3b7dfec9cac1341bba01c1ffdfce9ff9fc34a
FROM postgres:18.4@sha256:3a82e1f56c8f0f5616a11103ac3d47e632c3938698946a7ad26da0df1334744a

# expects the build context to be: $GOPATH/src/github.com/google/trillian
COPY storage/postgresql/schema/storage.sql /docker-entrypoint-initdb.d/storage.sql
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/docker/log_server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN go install ./cmd/trillian_log_server
RUN go run github.com/google/go-licenses/v2 save ./cmd/trillian_log_server --save_path /THIRD_PARTY_NOTICES

# Make a minimal image.
FROM gcr.io/distroless/base-debian12@sha256:348dac1808083ccc3366399d6db835875b4eaf7c9b694783f5a3f353c4b58a28
FROM gcr.io/distroless/base-debian12@sha256:62730825d3cf03571e0a1b8f014748de94d0404500f063593b614c23da38841d

COPY --from=build /go/bin/trillian_log_server /
COPY --from=build /THIRD_PARTY_NOTICES /THIRD_PARTY_NOTICES
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/docker/log_signer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN go install ./cmd/trillian_log_signer
RUN go run github.com/google/go-licenses/v2 save ./cmd/trillian_log_signer --save_path /THIRD_PARTY_NOTICES

# Make a minimal image.
FROM gcr.io/distroless/base-debian12@sha256:348dac1808083ccc3366399d6db835875b4eaf7c9b694783f5a3f353c4b58a28
FROM gcr.io/distroless/base-debian12@sha256:62730825d3cf03571e0a1b8f014748de94d0404500f063593b614c23da38841d

COPY --from=build /go/bin/trillian_log_signer /
COPY --from=build /THIRD_PARTY_NOTICES /THIRD_PARTY_NOTICES
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/kubernetes/mysql/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:jammy@sha256:0e0a0fc6d18feda9db1590da249ac93e8d5abfea8f4c3c0c849ce512b5ef8982
FROM ubuntu:jammy@sha256:3b06811b2afd352be909dd088a004166d665dc76d38b13eada33522a9d915c6f

# Patch the OS-level packages and remove unneeded dependencies.
RUN apt-get update \
Expand Down
Loading