Skip to content

Commit

Permalink
main -> 12.0 for mariadb-operator
Browse files Browse the repository at this point in the history
  • Loading branch information
grooverdan committed Feb 27, 2025
1 parent 91ba0cc commit 87a043a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions main-ubi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ COPY MariaDB.repo /etc/yum.repos.d/
# https://access.redhat.com/documentation/en-us/red_hat_software_certification/2024/html/red_hat_openshift_software_certification_policy_guide/assembly-requirements-for-container-images_openshift-sw-cert-policy-introduction#con-image-metadata-requirements_openshift-sw-cert-policy-container-images
LABEL name="MariaDB Server" \
vendor="MariaDB Community" \
version="11.8.0" \
version="12.0.0" \
release="Refer to Annotations org.opencontainers.image.{revision,source}" \
summary="MariaDB Database" \
description="MariaDB Database for relational SQL"
Expand All @@ -50,11 +50,11 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
org.opencontainers.image.licenses="GPL-2.0" \
org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
org.opencontainers.image.vendor="MariaDB Community" \
org.opencontainers.image.version="11.8.0" \
org.opencontainers.image.version="12.0.0" \
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"

# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
ARG MARIADB_VERSION=11.8.0
ARG MARIADB_VERSION=12.0.0
ENV MARIADB_VERSION=$MARIADB_VERSION
# release-status:Alpha
# release-support-type:Unknown
Expand Down
2 changes: 1 addition & 1 deletion main-ubi/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ docker_create_db_directories() {
}

_mariadb_version() {
echo -n "11.8.0-MariaDB"
echo -n "12.0.0-MariaDB"
}

# initializes the database directory
Expand Down
6 changes: 3 additions & 3 deletions main/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
org.opencontainers.image.licenses="GPL-2.0" \
org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
org.opencontainers.image.vendor="MariaDB Community" \
org.opencontainers.image.version="11.8.0" \
org.opencontainers.image.version="12.0.0" \
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"

# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
ARG MARIADB_VERSION=1:11.8.0+maria~ubu2404
ARG MARIADB_VERSION=1:12.0.0+maria~ubu2404
ENV MARIADB_VERSION $MARIADB_VERSION
# release-status:Alpha
# release-support-type:Unknown
# (https://downloads.mariadb.org/rest-api/mariadb/)

# Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.8.0/repo/ubuntu/ noble main main/debug"
ARG REPOSITORY="http://archive.mariadb.org/mariadb-12.0.0/repo/ubuntu/ noble main main/debug"

RUN set -e;\
echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
Expand Down
2 changes: 1 addition & 1 deletion main/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ docker_create_db_directories() {
}

_mariadb_version() {
echo -n "11.8.0-MariaDB"
echo -n "12.0.0-MariaDB"
}

# initializes the database directory
Expand Down

0 comments on commit 87a043a

Please sign in to comment.