Skip to content

changed mariadb to become moss compliant #2948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DivyaUpreti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

changed mariadb to become moss compliant #2948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions docker/mariadb/10/debian12/10.11/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -175,4 +176,4 @@ COPY docker-entrypoint.sh /usr/local/bin/
ENTRYPOINT ["docker-entrypoint.sh"]

EXPOSE 3306
CMD ["mariadbd"]
CMD ["mariadbd"]
7 changes: 4 additions & 3 deletions docker/mariadb/11/debian12/11.5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -175,4 +176,4 @@ COPY docker-entrypoint.sh /usr/local/bin/
ENTRYPOINT ["docker-entrypoint.sh"]

EXPOSE 3306
CMD ["mariadbd"]
CMD ["mariadbd"]
5 changes: 3 additions & 2 deletions docker/mariadb/templates/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -185,4 +186,4 @@ COPY docker-entrypoint.sh /usr/local/bin/
ENTRYPOINT ["docker-entrypoint.sh"]

EXPOSE 3306
CMD ["mariadbd"]
CMD ["mariadbd"]
8 changes: 4 additions & 4 deletions docker/mariadb/versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -78,4 +78,4 @@ versions:
templateArgs:
c2dRelease: 10.11.13
distroCodename: bookworm
distroMajor: '12'
distroMajor: '12'