-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #76 from stolp/KD-48
MariaDB: Update to version 10.11. Fixes #48.
- Loading branch information
Showing
3 changed files
with
19 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# vim:set ft=dockerfile: | ||
FROM ubuntu:bionic | ||
FROM ubuntu:jammy | ||
LABEL maintainer "BreadSpoon <[email protected]>" | ||
|
||
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added | ||
|
@@ -35,6 +35,8 @@ RUN set -ex; \ | |
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ | ||
\ | ||
# verify the signature | ||
mkdir ~/.gnupg; \ | ||
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \ | ||
export GNUPGHOME="$(mktemp -d)"; \ | ||
gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ | ||
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ | ||
|
@@ -78,12 +80,12 @@ RUN set -ex; \ | |
apt-key list | ||
|
||
# bashbrew-architectures: amd64 arm64v8 ppc64le | ||
ENV MARIADB_MAJOR 10.4 | ||
ENV MARIADB_MAJOR 10.11 | ||
# release-status:Stable | ||
# (https://downloads.mariadb.org/mariadb/+releases/) | ||
|
||
RUN set -e;\ | ||
echo "deb http://ftp.osuosl.org/pub/mariadb/repo/$MARIADB_MAJOR/ubuntu bionic main" > /etc/apt/sources.list.d/mariadb.list; \ | ||
echo "deb http://ftp.osuosl.org/pub/mariadb/repo/$MARIADB_MAJOR/ubuntu jammy main" > /etc/apt/sources.list.d/mariadb.list; \ | ||
{ \ | ||
echo 'Package: *'; \ | ||
echo 'Pin: release o=MariaDB'; \ | ||
|
@@ -108,7 +110,7 @@ RUN set -ex; \ | |
; \ | ||
rm -rf /var/lib/apt/lists/*; \ | ||
# comment out any "user" entires in the MySQL config ("docker-entrypoint.sh" or "--user" will handle user switching) | ||
sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf /etc/mysql/conf.d/*; \ | ||
sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf /etc/mysql/mariadb.conf.d/*.cnf; \ | ||
# purge and re-create /var/lib/mysql with appropriate ownership | ||
rm -rf /var/lib/mysql; \ | ||
mkdir -p /var/lib/mysql /var/run/mysqld; \ | ||
|
@@ -133,4 +135,4 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat | |
ENTRYPOINT ["docker-entrypoint.sh"] | ||
|
||
EXPOSE 3306 | ||
CMD ["mysqld"] | ||
CMD ["mariadbd"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters