diff --git a/.ci/Dockerfile b/.ci/Dockerfile index c35988ede..cba985c9e 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.24-alpine@sha256:daae04ebad0c21149979cd8e9db38f565ecefd8547cf4a591240dc1972cf1399 AS builder +FROM golang:1.26-alpine@sha256:2389ebfa5b7f43eeafbd6be0c3700cc46690ef842ad962f6c5bd6be49ed82039 AS builder # Allows for the proper yq to be downloaded # This arg is automatically set if the dockerfile is built with --platform flag diff --git a/index/generator/vendor/github.com/docker/distribution/Dockerfile b/index/generator/vendor/github.com/docker/distribution/Dockerfile index ebd42c242..9bad49eac 100644 --- a/index/generator/vendor/github.com/docker/distribution/Dockerfile +++ b/index/generator/vendor/github.com/docker/distribution/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.20.8 -ARG ALPINE_VERSION=3.18 -ARG XX_VERSION=1.2.1 +ARG ALPINE_VERSION=3.23 +ARG XX_VERSION=1.9.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base diff --git a/index/generator/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm b/index/generator/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm index 4230fba01..5584d0614 100644 --- a/index/generator/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm +++ b/index/generator/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm @@ -1,4 +1,4 @@ -FROM golang:1.23@sha256:51a6466e8dbf3e00e422eb0f7a97ac450b2d57b33617bbe8d2ee0bddcd9d0d37 +FROM golang:1.26@sha256:595c7847cff97c9a9e76f015083c481d26078f961c9c8dca3923132f51fe12f1 ENV GOOS=linux ENV GOARCH=arm diff --git a/index/generator/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64 b/index/generator/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64 index 59928252a..14e67c424 100644 --- a/index/generator/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64 +++ b/index/generator/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM golang:1.23@sha256:51a6466e8dbf3e00e422eb0f7a97ac450b2d57b33617bbe8d2ee0bddcd9d0d37 +FROM golang:1.26@sha256:595c7847cff97c9a9e76f015083c481d26078f961c9c8dca3923132f51fe12f1 ENV GOOS=linux ENV GOARCH=arm64 diff --git a/index/server/Dockerfile b/index/server/Dockerfile index 1d31cb630..1318b8e00 100644 --- a/index/server/Dockerfile +++ b/index/server/Dockerfile @@ -14,13 +14,13 @@ # limitations under the License. # Index Server build stage -FROM registry.access.redhat.com/ubi8/go-toolset:1.24.4-1754273152@sha256:ddad134f9fe193a6b3c7a87fa73b17e80212cdb0aa10dbd5a7581df96c998f1b AS index-builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.25.7-1774830670@sha256:4b526cb7dd4a6f7a72f246993b3e2cde97611db608529403aa6597e10f11c1cf AS index-builder USER root WORKDIR /tools COPY . . RUN CGO_ENABLED=0 go build -mod=vendor -o index-server main.go -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10@sha256:000dd8e4a3046ac7c47e65bbe01efc48d7a568e5ee9946cca1d74a7abf042d36 AS license +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1774368033@sha256:69c5a7ae39a5ab42160d4c6dd6014360a65659541766129225dc0402a41b2825 AS license ARG LICENSE_REPO="devfile/registry-support" ARG LICENSE_REF="main" USER root @@ -30,7 +30,7 @@ RUN mkdir -p /licenses RUN curl -sL https://raw.githubusercontent.com/${LICENSE_REPO}/refs/heads/${LICENSE_REF}/LICENSE -o /licenses/LICENSE # Application image -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10@sha256:000dd8e4a3046ac7c47e65bbe01efc48d7a568e5ee9946cca1d74a7abf042d36 AS runner +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1774368033@sha256:69c5a7ae39a5ab42160d4c6dd6014360a65659541766129225dc0402a41b2825 AS runner USER root # Install and configure dependencies diff --git a/index/server/vendor/github.com/docker/distribution/Dockerfile b/index/server/vendor/github.com/docker/distribution/Dockerfile index ebd42c242..9bad49eac 100644 --- a/index/server/vendor/github.com/docker/distribution/Dockerfile +++ b/index/server/vendor/github.com/docker/distribution/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.20.8 -ARG ALPINE_VERSION=3.18 -ARG XX_VERSION=1.2.1 +ARG ALPINE_VERSION=3.23 +ARG XX_VERSION=1.9.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base diff --git a/index/server/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm b/index/server/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm index 4230fba01..5584d0614 100644 --- a/index/server/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm +++ b/index/server/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm @@ -1,4 +1,4 @@ -FROM golang:1.23@sha256:51a6466e8dbf3e00e422eb0f7a97ac450b2d57b33617bbe8d2ee0bddcd9d0d37 +FROM golang:1.26@sha256:595c7847cff97c9a9e76f015083c481d26078f961c9c8dca3923132f51fe12f1 ENV GOOS=linux ENV GOARCH=arm diff --git a/index/server/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64 b/index/server/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64 index 59928252a..14e67c424 100644 --- a/index/server/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64 +++ b/index/server/vendor/github.com/pjbgf/sha1cd/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM golang:1.23@sha256:51a6466e8dbf3e00e422eb0f7a97ac450b2d57b33617bbe8d2ee0bddcd9d0d37 +FROM golang:1.26@sha256:595c7847cff97c9a9e76f015083c481d26078f961c9c8dca3923132f51fe12f1 ENV GOOS=linux ENV GOARCH=arm64 diff --git a/oci-registry/Dockerfile b/oci-registry/Dockerfile index 7f11ae21d..09303ead6 100644 --- a/oci-registry/Dockerfile +++ b/oci-registry/Dockerfile @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM registry.access.redhat.com/ubi8/go-toolset:1.24.4-1754273152@sha256:ddad134f9fe193a6b3c7a87fa73b17e80212cdb0aa10dbd5a7581df96c998f1b as registry +FROM registry.access.redhat.com/ubi8/go-toolset:1.25.7-1774830670@sha256:4b526cb7dd4a6f7a72f246993b3e2cde97611db608529403aa6597e10f11c1cf as registry ARG PKG="github.com/docker/distribution" ARG PKG_VERSION="v2.8.3" ENV GOPATH=/go @@ -26,7 +26,7 @@ RUN VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVIS echo -n "${VERSION}" | tee /tmp/.version; RUN set -x ; CGO_ENABLED=0 GO111MODULE=auto go build -tags "include_oss,include_gcs" -trimpath -ldflags "$(cat /tmp/.ldflags) -s -w" -o /usr/bin/registry ./cmd/registry -FROM registry.access.redhat.com/ubi10-minimal:10.1@sha256:380da76bb8a69e333b6c11341d600f5d3aab9ee5b8c95ceb64aae2457f5c1c6e +FROM registry.access.redhat.com/ubi10-minimal:10.1-1774545417@sha256:7bd3d2e7f5c507aebd1575d0f2fab9fe3e882e25fee54fa07f7970aa8bbc5fab RUN microdnf update -y && rm -rf /var/cache/yum && microdnf install -y ca-certificates httpd-tools shadow-utils # Create a non-root user to run the server as diff --git a/registry-library/vendor/github.com/docker/distribution/Dockerfile b/registry-library/vendor/github.com/docker/distribution/Dockerfile index ebd42c242..9bad49eac 100644 --- a/registry-library/vendor/github.com/docker/distribution/Dockerfile +++ b/registry-library/vendor/github.com/docker/distribution/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.20.8 -ARG ALPINE_VERSION=3.18 -ARG XX_VERSION=1.2.1 +ARG ALPINE_VERSION=3.23 +ARG XX_VERSION=1.9.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base diff --git a/tests/integration/Dockerfile b/tests/integration/Dockerfile index e501cfd2b..d684c453a 100644 --- a/tests/integration/Dockerfile +++ b/tests/integration/Dockerfile @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM registry.access.redhat.com/ubi8/go-toolset:1.24.4-1754273152@sha256:ddad134f9fe193a6b3c7a87fa73b17e80212cdb0aa10dbd5a7581df96c998f1b AS builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.25.7-1774830670@sha256:4b526cb7dd4a6f7a72f246993b3e2cde97611db608529403aa6597e10f11c1cf AS builder ARG LIBRARY_REPO="https://github.com/devfile/registry-support" ARG LIBRARY_REF="main" USER root @@ -29,7 +29,7 @@ RUN cd /registry-support/registry-library && ./build.sh && cp /registry-support/ # Build the test binary RUN /registry-test/build.sh -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10@sha256:000dd8e4a3046ac7c47e65bbe01efc48d7a568e5ee9946cca1d74a7abf042d36 AS license +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1774368033@sha256:69c5a7ae39a5ab42160d4c6dd6014360a65659541766129225dc0402a41b2825 AS license ARG LICENSE_REPO="devfile/registry-support" ARG LICENSE_REF="main" USER root @@ -38,7 +38,7 @@ USER root RUN mkdir -p /licenses RUN curl -sL https://raw.githubusercontent.com/${LICENSE_REPO}/refs/heads/${LICENSE_REF}/LICENSE -o /licenses/LICENSE -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10@sha256:000dd8e4a3046ac7c47e65bbe01efc48d7a568e5ee9946cca1d74a7abf042d36 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1774368033@sha256:69c5a7ae39a5ab42160d4c6dd6014360a65659541766129225dc0402a41b2825 USER root WORKDIR /registry-test