Skip to content

Commit b785d26

Browse files
ifelifel
authored
Merge branch 'MariaDB:master' into master
2 parents 4d051b4 + 5e35bb0 commit b785d26

File tree

19 files changed

+118
-90
lines changed

19 files changed

+118
-90
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ on:
55
branches-ignore:
66
- next
77
paths-ignore:
8+
- examples
89
- Dockerfile.template
910
- LICENSE
1011
- README.md
1112
push:
1213
branches-ignore:
1314
- next
1415
paths-ignore:
16+
- examples
1517
- Dockerfile.template
1618
- LICENSE
1719
- README.md

‎.test/initdb.d/repluser.sql

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.test/replica-initdb.d/change-master.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.test/run.sh

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,11 @@ die()
4242
}
4343
trap "killoff" EXIT
4444

45-
if docker run --rm "$image" mariadb --version 2>/dev/null
46-
then
47-
mariadb=mariadb
48-
RPL_MONITOR="REPLICA MONITOR"
49-
v=$(docker run --rm "$image" mariadb --version)
50-
if [[ $v =~ Distrib\ 10.4 ]]; then
51-
# the new age hasn't begun yet
52-
RPL_MONITOR="REPLICATION CLIENT"
53-
fi
54-
else
55-
# still running 10.3
56-
mariadb=mysql
45+
mariadb=mariadb
46+
RPL_MONITOR="REPLICA MONITOR"
47+
v=$(docker run --rm "$image" mariadb --version)
48+
if [[ $v =~ Distrib\ 10.4 ]]; then
49+
# the new age hasn't begun yet
5750
RPL_MONITOR="REPLICATION CLIENT"
5851
fi
5952

@@ -685,6 +678,8 @@ fi
685678
-e MARIADB_USER=bob \
686679
-e MARIADB_PASSWORD=roger \
687680
-e MARIADB_DATABASE=rabbit \
681+
-e MARIADB_REPLICATION_USER="repluser" \
682+
-e MARIADB_REPLICATION_PASSWORD="replpassword" \
688683
"${image}" --log-bin --log-basename=my-mariadb
689684
readarray -t vals < <(mariadbclient -u root --batch --skip-column-names -e 'show master status\G')
690685
lastfile="${vals[1]}"
@@ -706,18 +701,18 @@ fi
706701
-d \
707702
--rm \
708703
--name "$cname" \
709-
-e MASTER_HOST="$master_host" \
704+
-e MARIADB_MASTER_HOST="$master_host" \
705+
-e MARIADB_REPLICATION_USER="repluser" \
706+
-e MARIADB_REPLICATION_PASSWORD="replpassword" \
710707
-e MARIADB_RANDOM_ROOT_PASSWORD=1 \
711-
-e MARIADB_MYSQL_LOCALHOST_USER=1 \
712-
-e MARIADB_MYSQL_LOCALHOST_GRANTS="REPLICATION CLIENT /*!100509 ,REPLICA MONITOR */" \
713-
-v "${dir}"/replica-initdb.d/:/docker-entrypoint-initdb.d:Z \
708+
-e MARIADB_HEALTHCHECK_GRANTS="${RPL_MONITOR}" \
714709
--network=container:"$master_host" \
715-
--health-cmd='healthcheck.sh --su-mysql --replication_io --replication_sql --replication_seconds_behind_master=0 --replication' \
710+
--health-cmd='healthcheck.sh --replication_io --replication_sql --replication_seconds_behind_master=0 --replication' \
716711
--health-interval=3s \
717712
"$image" --server-id=2 --port 3307)
718713

719714
c="${DOCKER_LIBRARY_START_TIMEOUT:-10}"
720-
until docker exec "$cid" healthcheck.sh --su-mysql --connect --replication_io --replication_sql --replication_seconds_behind_master=0 --replication || [ "$c" -eq 0 ]
715+
until docker exec "$cid" healthcheck.sh --connect --replication_io --replication_sql --replication_seconds_behind_master=0 --replication || [ "$c" -eq 0 ]
721716
do
722717
sleep 1
723718
c=$(( c - 1 ))
@@ -728,10 +723,6 @@ fi
728723
cid=$cid_primary killoff
729724
die "Table contents didn't match on replica"
730725
fi
731-
docker exec --user mysql -i \
732-
"$cname" \
733-
$mariadb \
734-
-e "SHOW SLAVE STATUS\G"
735726
killoff
736727
cid=$master_host
737728
killoff

‎10.10/Dockerfile

Lines changed: 4 additions & 4 deletions
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="10.10.5" \
78+
org.opencontainers.image.version="10.10.6" \
7979
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
8080

8181
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
82-
ARG MARIADB_VERSION=1:10.10.5+maria~ubu2204
82+
ARG MARIADB_VERSION=1:10.10.6+maria~ubu2204
8383
ENV MARIADB_VERSION $MARIADB_VERSION
8484
# release-status:Stable
8585
# 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-10.10.5/repo/ubuntu/ jammy main"
89+
ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.10.6/repo/ubuntu/ jammy main main/debug"
9090

9191
RUN set -e;\
9292
echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -116,7 +116,7 @@ RUN set -ex; \
116116
rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
117117
rm -rf /var/lib/apt/lists/*; \
118118
# purge and re-create /var/lib/mysql with appropriate ownership
119-
rm -rf /var/lib/mysql; \
119+
rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
120120
mkdir -p /var/lib/mysql /var/run/mysqld; \
121121
chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
122122
# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

‎10.11/Dockerfile

Lines changed: 4 additions & 4 deletions
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="10.11.4" \
78+
org.opencontainers.image.version="10.11.5" \
7979
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
8080

8181
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
82-
ARG MARIADB_VERSION=1:10.11.4+maria~ubu2204
82+
ARG MARIADB_VERSION=1:10.11.5+maria~ubu2204
8383
ENV MARIADB_VERSION $MARIADB_VERSION
8484
# release-status:Stable
8585
# release-support-type:Long 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-10.11.4/repo/ubuntu/ jammy main"
89+
ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.11.5/repo/ubuntu/ jammy main main/debug"
9090

9191
RUN set -e;\
9292
echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -116,7 +116,7 @@ RUN set -ex; \
116116
rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
117117
rm -rf /var/lib/apt/lists/*; \
118118
# purge and re-create /var/lib/mysql with appropriate ownership
119-
rm -rf /var/lib/mysql; \
119+
rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
120120
mkdir -p /var/lib/mysql /var/run/mysqld; \
121121
chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
122122
# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

‎10.4/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,20 @@ 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="10.4.30" \
78+
org.opencontainers.image.version="10.4.31" \
7979
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
8080

8181
# bashbrew-architectures: amd64 arm64v8 ppc64le
8282
ARG MARIADB_MAJOR=10.4
8383
ENV MARIADB_MAJOR $MARIADB_MAJOR
84-
ARG MARIADB_VERSION=1:10.4.30+maria~ubu2004
84+
ARG MARIADB_VERSION=1:10.4.31+maria~ubu2004
8585
ENV MARIADB_VERSION $MARIADB_VERSION
8686
# release-status:Stable
8787
# release-support-type:Long Term Support
8888
# (https://downloads.mariadb.org/rest-api/mariadb/)
8989

9090
# Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
91-
ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.4.30/repo/ubuntu/ focal main"
91+
ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.4.31/repo/ubuntu/ focal main main/debug"
9292

9393
RUN set -e;\
9494
echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -118,7 +118,7 @@ RUN set -ex; \
118118
rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
119119
rm -rf /var/lib/apt/lists/*; \
120120
# purge and re-create /var/lib/mysql with appropriate ownership
121-
rm -rf /var/lib/mysql; \
121+
rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
122122
mkdir -p /var/lib/mysql /var/run/mysqld; \
123123
chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
124124
# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

‎10.5/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,20 @@ 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="10.5.21" \
78+
org.opencontainers.image.version="10.5.22" \
7979
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
8080

8181
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
8282
ARG MARIADB_MAJOR=10.5
8383
ENV MARIADB_MAJOR $MARIADB_MAJOR
84-
ARG MARIADB_VERSION=1:10.5.21+maria~ubu2004
84+
ARG MARIADB_VERSION=1:10.5.22+maria~ubu2004
8585
ENV MARIADB_VERSION $MARIADB_VERSION
8686
# release-status:Stable
8787
# release-support-type:Long Term Support
8888
# (https://downloads.mariadb.org/rest-api/mariadb/)
8989

9090
# Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
91-
ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.5.21/repo/ubuntu/ focal main"
91+
ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.5.22/repo/ubuntu/ focal main main/debug"
9292

9393
RUN set -e;\
9494
echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -118,7 +118,7 @@ RUN set -ex; \
118118
rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
119119
rm -rf /var/lib/apt/lists/*; \
120120
# purge and re-create /var/lib/mysql with appropriate ownership
121-
rm -rf /var/lib/mysql; \
121+
rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
122122
mkdir -p /var/lib/mysql /var/run/mysqld; \
123123
chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
124124
# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

‎10.6/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,20 @@ 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="10.6.14" \
78+
org.opencontainers.image.version="10.6.15" \
7979
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
8080

8181
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
8282
ARG MARIADB_MAJOR=10.6
8383
ENV MARIADB_MAJOR $MARIADB_MAJOR
84-
ARG MARIADB_VERSION=1:10.6.14+maria~ubu2004
84+
ARG MARIADB_VERSION=1:10.6.15+maria~ubu2004
8585
ENV MARIADB_VERSION $MARIADB_VERSION
8686
# release-status:Stable
8787
# release-support-type:Long Term Support
8888
# (https://downloads.mariadb.org/rest-api/mariadb/)
8989

9090
# Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
91-
ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.6.14/repo/ubuntu/ focal main"
91+
ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.6.15/repo/ubuntu/ focal main main/debug"
9292

9393
RUN set -e;\
9494
echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -118,7 +118,7 @@ RUN set -ex; \
118118
rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
119119
rm -rf /var/lib/apt/lists/*; \
120120
# purge and re-create /var/lib/mysql with appropriate ownership
121-
rm -rf /var/lib/mysql; \
121+
rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
122122
mkdir -p /var/lib/mysql /var/run/mysqld; \
123123
chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
124124
# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

‎10.9/Dockerfile

Lines changed: 4 additions & 4 deletions
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="10.9.7" \
78+
org.opencontainers.image.version="10.9.8" \
7979
org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
8080

8181
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x
82-
ARG MARIADB_VERSION=1:10.9.7+maria~ubu2204
82+
ARG MARIADB_VERSION=1:10.9.8+maria~ubu2204
8383
ENV MARIADB_VERSION $MARIADB_VERSION
8484
# release-status:Stable
8585
# 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-10.9.7/repo/ubuntu/ jammy main"
89+
ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.9.8/repo/ubuntu/ jammy main main/debug"
9090

9191
RUN set -e;\
9292
echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -116,7 +116,7 @@ RUN set -ex; \
116116
rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
117117
rm -rf /var/lib/apt/lists/*; \
118118
# purge and re-create /var/lib/mysql with appropriate ownership
119-
rm -rf /var/lib/mysql; \
119+
rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
120120
mkdir -p /var/lib/mysql /var/run/mysqld; \
121121
chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
122122
# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

0 commit comments

Comments
 (0)