diff --git a/docker/mariadb/10/debian12/10.11/Dockerfile b/docker/mariadb/10/debian12/10.11/Dockerfile index 3d0f8f5120..7c9d5213f8 100644 --- a/docker/mariadb/10/debian12/10.11/Dockerfile +++ b/docker/mariadb/10/debian12/10.11/Dockerfile @@ -1,6 +1,7 @@ # Build gosu from the source. As by 2023-09-26 project only have releases # from go 1.18. https://github.com/tianon/gosu/releases -FROM golang:1.23 as gosu-build +ARG BASE_REGISTRY="docker.io" +FROM ${BASE_REGISTRY}/golang as gosu-build RUN git clone https://github.com/tianon/gosu.git --branch 1.17 /go/src/github.com/tianon/gosu @@ -45,7 +46,7 @@ RUN set -eux; \ RUN ARCH=amd64 GOARCH=amd64 gosu-build-and-test.sh RUN set -eux; ls -lAFh /go/bin/gosu-*; file /go/bin/gosu-* -FROM marketplace.gcr.io/google/debian12 +FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 ENV C2D_RELEASE 10.11.13 @@ -175,4 +176,4 @@ COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 3306 -CMD ["mariadbd"] +CMD ["mariadbd"] \ No newline at end of file diff --git a/docker/mariadb/11/debian12/11.5/Dockerfile b/docker/mariadb/11/debian12/11.5/Dockerfile index f737fb352c..dca48ecf4e 100644 --- a/docker/mariadb/11/debian12/11.5/Dockerfile +++ b/docker/mariadb/11/debian12/11.5/Dockerfile @@ -1,6 +1,7 @@ # Build gosu from the source. As by 2023-09-26 project only have releases # from go 1.18. https://github.com/tianon/gosu/releases -FROM golang:1.23 as gosu-build +ARG BASE_REGISTRY="docker.io" +FROM ${BASE_REGISTRY}/golang as gosu-build RUN git clone https://github.com/tianon/gosu.git --branch 1.17 /go/src/github.com/tianon/gosu @@ -45,7 +46,7 @@ RUN set -eux; \ RUN ARCH=amd64 GOARCH=amd64 gosu-build-and-test.sh RUN set -eux; ls -lAFh /go/bin/gosu-*; file /go/bin/gosu-* -FROM marketplace.gcr.io/google/debian12 +FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 ENV C2D_RELEASE 11.5.2 @@ -175,4 +176,4 @@ COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 3306 -CMD ["mariadbd"] +CMD ["mariadbd"] \ No newline at end of file diff --git a/docker/mariadb/templates/Dockerfile.template b/docker/mariadb/templates/Dockerfile.template index e758f6c3e4..ebbf28a9da 100644 --- a/docker/mariadb/templates/Dockerfile.template +++ b/docker/mariadb/templates/Dockerfile.template @@ -6,7 +6,8 @@ # Build gosu from the source. As by 2023-09-26 project only have releases # from go 1.18. https://github.com/tianon/gosu/releases -FROM golang:{{ $golang.Version }} as gosu-build +ARG BASE_REGISTRY="docker.io" +FROM ${BASE_REGISTRY}/golang as gosu-build RUN git clone https://github.com/tianon/gosu.git --branch {{ $gosu.Version }} /go/src/github.com/tianon/gosu @@ -185,4 +186,4 @@ COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 3306 -CMD ["mariadbd"] +CMD ["mariadbd"] \ No newline at end of file diff --git a/docker/mariadb/versions.yaml b/docker/mariadb/versions.yaml index e603433a8f..856ec52ea4 100644 --- a/docker/mariadb/versions.yaml +++ b/docker/mariadb/versions.yaml @@ -16,7 +16,7 @@ cloudbuild: - docker_image: gcr.io/cloud-builders/docker:24.0.9 + docker_image: gcr.io/cloud-builders/docker@sha256:1a9553236b25fd6e1bf2a864c8becb26782c429f4570695b27f4ad6f1a0ed75e enable_parallel: false versions: - annotations: @@ -26,7 +26,7 @@ versions: excludeTests: - tests/functional_tests/10_create_db_test.yaml - tests/functional_tests/10_remote_host_test.yaml - from: marketplace.gcr.io/google/debian12 + from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 packages: golang: version: '1.23' @@ -57,7 +57,7 @@ versions: excludeTests: - tests/functional_tests/11_create_db_test.yaml - tests/functional_tests/11_remote_host_test.yaml - from: marketplace.gcr.io/google/debian12 + from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 packages: golang: version: '1.23' @@ -78,4 +78,4 @@ versions: templateArgs: c2dRelease: 10.11.13 distroCodename: bookworm - distroMajor: '12' + distroMajor: '12' \ No newline at end of file