Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 179af10

Browse files
committedNov 21, 2024
tmp: version hacks on update.sh
1 parent ed58e85 commit 179af10

File tree

5 files changed

+24
-18
lines changed

5 files changed

+24
-18
lines changed
 

‎main-ubi/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ COPY MariaDB.repo /etc/yum.repos.d/
3636
# 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
3737
LABEL name="MariaDB Server" \
3838
vendor="MariaDB Community" \
39-
version="11.7.0" \
39+
version="11.7.1" \
4040
release="Refer to Annotations org.opencontainers.image.{revision,source}" \
4141
summary="MariaDB Database" \
4242
description="MariaDB Database for relational SQL"
@@ -50,14 +50,14 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
5050
org.opencontainers.image.licenses="GPL-2.0" \
5151
org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
5252
org.opencontainers.image.vendor="MariaDB Community" \
53-
org.opencontainers.image.version="11.7.0" \
53+
org.opencontainers.image.version="11.7.1" \
5454
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
5555

5656
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
57-
ARG MARIADB_VERSION=11.7.0
57+
ARG MARIADB_VERSION=11.7.1
5858
ENV MARIADB_VERSION=$MARIADB_VERSION
59-
# release-status:Alpha
60-
# release-support-type:Unknown
59+
# release-status:RC
60+
# release-support-type:Short Term Support
6161
# (https://downloads.mariadb.org/rest-api/mariadb/)
6262

6363
# missing pwgen(epel), jemalloc(epel) (as entrypoint/user extensions)

‎main-ubi/docker-entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ docker_create_db_directories() {
225225
}
226226

227227
_mariadb_version() {
228-
echo -n "11.7.0-MariaDB"
228+
echo -n "11.7.1-MariaDB"
229229
}
230230

231231
# initializes the database directory

‎main/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
7575
org.opencontainers.image.licenses="GPL-2.0" \
7676
org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
7777
org.opencontainers.image.vendor="MariaDB Community" \
78-
org.opencontainers.image.version="11.7.0" \
78+
org.opencontainers.image.version="11.7.1" \
7979
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
8080

8181
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
82-
ARG MARIADB_VERSION=1:11.7.0+maria~ubu2404
82+
ARG MARIADB_VERSION=1:11.7.1+maria~ubu2404
8383
ENV MARIADB_VERSION $MARIADB_VERSION
84-
# release-status:Alpha
85-
# release-support-type:Unknown
84+
# release-status:RC
85+
# release-support-type:Short Term Support
8686
# (https://downloads.mariadb.org/rest-api/mariadb/)
8787

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

9191
RUN set -e;\
9292
echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \

‎main/docker-entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ docker_create_db_directories() {
225225
}
226226

227227
_mariadb_version() {
228-
echo -n "11.7.0-MariaDB"
228+
echo -n "11.7.1-MariaDB"
229229
}
230230

231231
# initializes the database directory

‎update.sh

+12-6
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ update_version_array()
185185

186186
mariaversion()
187187
{
188+
if [ "$version" = main ]; then
189+
#version=11.7
190+
mariaVersion=11.7.1;
191+
return
192+
fi
188193
mariaVersion=$(curl -fsSL "$DOWNLOADS_REST_API/mariadb/${version%-*}" \
189194
| jq -r 'first(.releases[] | .release_id | select(. | test("[0-9]+.[0-9]+.[0-9]+$")))')
190195
mariaVersion=${mariaVersion//\"}
@@ -228,19 +233,20 @@ for version in "${versions[@]}"; do
228233
ubi=
229234
fi
230235

231-
if [ "${version%-*}" == $development_version ]; then
232-
in_development
233-
continue
234-
fi
235236
if [ ! -d "$version" ]; then
236237
version=${version%.[[:digit:]]*}
237238
else
238239
mariaversion
239240
fi
240241
readarray -t release <<< "$(curl -fsSL "$DOWNLOADS_REST_API/mariadb/" \
241242
| jq -r --arg version "${version%-*}" '.major_releases[] | select(.release_id == $version) | [ .release_status ] , [ .release_support_type ] | @tsv')"
242-
releaseStatus=${release[0]:-Stable}
243-
supportType=${release[1]:-Short Term Support}
243+
if [ "$version" = 'main' ]; then
244+
releaseStatus=${release[0]:-RC}
245+
supportType=${release[1]:-Short Term Support}
246+
else
247+
releaseStatus=${release[0]:-Stable}
248+
supportType=${release[1]:-Short Term Support}
249+
fi
244250

245251
update_version
246252
done

0 commit comments

Comments
 (0)
Please sign in to comment.