1berry/mariadb-docker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

10.11 MARIADB_MAJOR not removed

Browse Source
This commit is contained in:
Daniel Black 2022-10-14 14:33:54 +11:00
parent af2b68cf80
commit 5f39e93d90
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
10.11/Dockerfile
View File

@ -71,8 +71,6 @@ RUN set -ex; \
apt-key list apt-key list
# bashbrew-architectures: amd64 arm64v8 ppc64le s390x # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
ARG MARIADB_MAJOR=10.11
ENV MARIADB_MAJOR $MARIADB_MAJOR
ARG MARIADB_VERSION=1:10.11.0+maria~ubu2204 ARG MARIADB_VERSION=1:10.11.0+maria~ubu2204
ENV MARIADB_VERSION $MARIADB_VERSION ENV MARIADB_VERSION $MARIADB_VERSION
# release-status:Alpha # release-status:Alpha
@ -95,8 +93,8 @@ RUN set -e;\
# also, we set debconf keys to make APT a little quieter # also, we set debconf keys to make APT a little quieter
RUN set -ex; \ RUN set -ex; \
{ \ { \
echo "mariadb-server-$MARIADB_MAJOR" mysql-server/root_password password 'unused'; \ echo "mariadb-server" mysql-server/root_password password 'unused'; \
echo "mariadb-server-$MARIADB_MAJOR" mysql-server/root_password_again password 'unused'; \ echo "mariadb-server" mysql-server/root_password_again password 'unused'; \
} | debconf-set-selections; \ } | debconf-set-selections; \
apt-get update; \ apt-get update; \
# mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos

18
update.sh
View File

@ -60,14 +60,6 @@ update_version()
10.5) 10.5)
sed -i '/backwards compat/d' "$version/Dockerfile" sed -i '/backwards compat/d' "$version/Dockerfile"
;; ;;
10.9 | 10.10)
# quoted $ intentional
# shellcheck disable=SC2016
sed -i -e '/^ARG MARIADB_MAJOR/d' \
-e '/^ENV MARIADB_MAJOR/d' \
-e 's/-\$MARIADB_MAJOR//' \
"$version/Dockerfile"
;&
*) *)
sed -i -e '/^CMD/s/mysqld/mariadbd/' \ sed -i -e '/^CMD/s/mysqld/mariadbd/' \
-e '/backwards compat/d' "$version/Dockerfile" -e '/backwards compat/d' "$version/Dockerfile"
@ -80,7 +72,15 @@ update_version()
-e 's/mysql_tzinfo_to_sql/mariadb-tzinfo-to-sql/' \ -e 's/mysql_tzinfo_to_sql/mariadb-tzinfo-to-sql/' \
"$version/docker-entrypoint.sh" "$version/docker-entrypoint.sh"
sed -i -e '0,/#ENDOFSUBSTITUTIONS/s/\bmysql\b/mariadb/' "$version/healthcheck.sh" sed -i -e '0,/#ENDOFSUBSTITUTIONS/s/\bmysql\b/mariadb/' "$version/healthcheck.sh"
;; if [[ ! $version =~ 10.[678] ]]; then
# quoted $ intentional
# shellcheck disable=SC2016
sed -i -e '/^ARG MARIADB_MAJOR/d' \
-e '/^ENV MARIADB_MAJOR/d' \
-e 's/-\$MARIADB_MAJOR//' \
"$version/Dockerfile"
fi
;&
esac esac
} }