diff --git a/5.6/Dockerfile.debian b/5.6/Dockerfile.debian deleted file mode 100644 index 901ecc06f..000000000 --- a/5.6/Dockerfile.debian +++ /dev/null @@ -1,97 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:stretch-slim - -# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mysql && useradd -r -g mysql mysql - -RUN apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* - -# add gosu for easy step-down from root -# https://github.com/tianon/gosu/releases -ENV GOSU_VERSION 1.14 -RUN set -eux; \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends ca-certificates wget; \ - rm -rf /var/lib/apt/lists/*; \ - dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ - wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ - wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ - export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ - apt-mark auto '.*' > /dev/null; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - chmod +x /usr/local/bin/gosu; \ - gosu --version; \ - gosu nobody true - -RUN mkdir /docker-entrypoint-initdb.d - -RUN apt-get update && apt-get install -y --no-install-recommends \ -# for MYSQL_RANDOM_ROOT_PASSWORD - pwgen \ -# FATAL ERROR: please install the following Perl modules before executing /usr/local/mysql/scripts/mysql_install_db: -# File::Basename -# File::Copy -# Sys::Hostname -# Data::Dumper - perl \ -# install "xz-utils" for .sql.xz docker-entrypoint-initdb.d files - xz-utils \ - && rm -rf /var/lib/apt/lists/* - -RUN set -ex; \ -# gpg: key 5072E1F5: public key "MySQL Release Engineering " imported - key='A4A9406876FCBD3C456770C88C718D3B5072E1F5'; \ - export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME"; \ - apt-key list > /dev/null - -ENV MYSQL_MAJOR 5.6 -ENV MYSQL_VERSION 5.6.51-1debian9 - -RUN echo 'deb http://repo.mysql.com/apt/debian/ stretch mysql-5.6' > /etc/apt/sources.list.d/mysql.list - -# the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql) -# also, we set debconf keys to make APT a little quieter -RUN { \ - echo mysql-community-server mysql-community-server/data-dir select ''; \ - echo mysql-community-server mysql-community-server/root-pass password ''; \ - echo mysql-community-server mysql-community-server/re-root-pass password ''; \ - echo mysql-community-server mysql-community-server/remove-test-db select false; \ - } | debconf-set-selections \ - && apt-get update \ - && apt-get install -y \ - mysql-server="${MYSQL_VERSION}" \ -# comment out a few problematic configuration values - && find /etc/mysql/ -name '*.cnf' -print0 \ - | xargs -0 grep -lZE '^(bind-address|log)' \ - | xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/' \ -# don't reverse lookup hostnames, they are usually another container - && echo '[mysqld]\nskip-host-cache\nskip-name-resolve' > /etc/mysql/conf.d/docker.cnf \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql /var/run/mysqld \ - && chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \ -# 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 - && chmod 1777 /var/run/mysqld /var/lib/mysql - -VOLUME /var/lib/mysql - -COPY docker-entrypoint.sh /usr/local/bin/ -RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat -ENTRYPOINT ["docker-entrypoint.sh"] - -EXPOSE 3306 -CMD ["mysqld"] diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh deleted file mode 100755 index 779aa3621..000000000 --- a/5.6/docker-entrypoint.sh +++ /dev/null @@ -1,415 +0,0 @@ -#!/bin/bash -set -eo pipefail -shopt -s nullglob - -# logging functions -mysql_log() { - local type="$1"; shift - # accept argument string or stdin - local text="$*"; if [ "$#" -eq 0 ]; then text="$(cat)"; fi - local dt; dt="$(date --rfc-3339=seconds)" - printf '%s [%s] [Entrypoint]: %s\n' "$dt" "$type" "$text" -} -mysql_note() { - mysql_log Note "$@" -} -mysql_warn() { - mysql_log Warn "$@" >&2 -} -mysql_error() { - mysql_log ERROR "$@" >&2 - exit 1 -} - -# usage: file_env VAR [DEFAULT] -# ie: file_env 'XYZ_DB_PASSWORD' 'example' -# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of -# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature) -file_env() { - local var="$1" - local fileVar="${var}_FILE" - local def="${2:-}" - if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then - mysql_error "Both $var and $fileVar are set (but are exclusive)" - fi - local val="$def" - if [ "${!var:-}" ]; then - val="${!var}" - elif [ "${!fileVar:-}" ]; then - val="$(< "${!fileVar}")" - fi - export "$var"="$val" - unset "$fileVar" -} - -# check to see if this file is being run or sourced from another script -_is_sourced() { - # https://unix.stackexchange.com/a/215279 - [ "${#FUNCNAME[@]}" -ge 2 ] \ - && [ "${FUNCNAME[0]}" = '_is_sourced' ] \ - && [ "${FUNCNAME[1]}" = 'source' ] -} - -# usage: docker_process_init_files [file [file [...]]] -# ie: docker_process_init_files /always-initdb.d/* -# process initializer files, based on file extensions -docker_process_init_files() { - # mysql here for backwards compatibility "${mysql[@]}" - mysql=( docker_process_sql ) - - echo - local f - for f; do - case "$f" in - *.sh) - # https://github.com/docker-library/postgres/issues/450#issuecomment-393167936 - # https://github.com/docker-library/postgres/pull/452 - if [ -x "$f" ]; then - mysql_note "$0: running $f" - "$f" - else - mysql_note "$0: sourcing $f" - . "$f" - fi - ;; - *.sql) mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;; - *.sql.gz) mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;; - *.sql.xz) mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;; - *) mysql_warn "$0: ignoring $f" ;; - esac - echo - done -} - -# arguments necessary to run "mysqld --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) -_verboseHelpArgs=( - --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 -) - -mysql_check_config() { - local toRun=( "$@" "${_verboseHelpArgs[@]}" ) errors - if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then - mysql_error $'mysqld failed while attempting to check config\n\tcommand was: '"${toRun[*]}"$'\n\t'"$errors" - fi -} - -# Fetch value from server config -# We use mysqld --verbose --help instead of my_print_defaults because the -# latter only show values present in config files, and not server defaults -mysql_get_config() { - local conf="$1"; shift - "$@" "${_verboseHelpArgs[@]}" 2>/dev/null \ - | awk -v conf="$conf" '$1 == conf && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }' - # match "datadir /some/path with/spaces in/it here" but not "--xyz=abc\n datadir (xyz)" -} - -# Do a temporary startup of the MySQL server, for init purposes -docker_temp_server_start() { - if [ "${MYSQL_MAJOR}" = '5.6' ] || [ "${MYSQL_MAJOR}" = '5.7' ]; then - "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" & - mysql_note "Waiting for server startup" - local i - for i in {30..0}; do - # only use the root password if the database has already been initialized - # so that it won't try to fill in a password file when it hasn't been set yet - extraArgs=() - if [ -z "$DATABASE_ALREADY_EXISTS" ]; then - extraArgs+=( '--dont-use-mysql-root-password' ) - fi - if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then - break - fi - sleep 1 - done - if [ "$i" = 0 ]; then - mysql_error "Unable to start server." - fi - else - # For 5.7+ the server is ready for use as soon as startup command unblocks - if ! "$@" --daemonize --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}"; then - mysql_error "Unable to start server." - fi - fi -} - -# Stop the server. When using a local socket file mysqladmin will block until -# the shutdown is complete. -docker_temp_server_stop() { - if ! mysqladmin --defaults-extra-file=<( _mysql_passfile ) shutdown -uroot --socket="${SOCKET}"; then - mysql_error "Unable to shut down server." - fi -} - -# Verify that the minimally required password settings are set for new databases. -docker_verify_minimum_env() { - if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then - mysql_error <<-'EOF' - Database is uninitialized and password option is not specified - You need to specify one of the following: - - MYSQL_ROOT_PASSWORD - - MYSQL_ALLOW_EMPTY_PASSWORD - - MYSQL_RANDOM_ROOT_PASSWORD - EOF - fi - - # This will prevent the CREATE USER from failing (and thus exiting with a half-initialized database) - if [ "$MYSQL_USER" = 'root' ]; then - mysql_error <<-'EOF' - MYSQL_USER="root", MYSQL_USER and MYSQL_PASSWORD are for configuring a regular user and cannot be used for the root user - Remove MYSQL_USER="root" and use one of the following to control the root user password: - - MYSQL_ROOT_PASSWORD - - MYSQL_ALLOW_EMPTY_PASSWORD - - MYSQL_RANDOM_ROOT_PASSWORD - EOF - fi - - # warn when missing one of MYSQL_USER or MYSQL_PASSWORD - if [ -n "$MYSQL_USER" ] && [ -z "$MYSQL_PASSWORD" ]; then - mysql_warn 'MYSQL_USER specified, but missing MYSQL_PASSWORD; MYSQL_USER will not be created' - elif [ -z "$MYSQL_USER" ] && [ -n "$MYSQL_PASSWORD" ]; then - mysql_warn 'MYSQL_PASSWORD specified, but missing MYSQL_USER; MYSQL_PASSWORD will be ignored' - fi -} - -# creates folders for the database -# also ensures permission for user mysql of run as root -docker_create_db_directories() { - local user; user="$(id -u)" - - # TODO other directories that are used by default? like /var/lib/mysql-files - # see https://github.com/docker-library/mysql/issues/562 - mkdir -p "$DATADIR" - - if [ "$user" = "0" ]; then - # this will cause less disk access than `chown -R` - find "$DATADIR" \! -user mysql -exec chown mysql '{}' + - fi -} - -# initializes the database directory -docker_init_database_dir() { - mysql_note "Initializing database files" - if [ "$MYSQL_MAJOR" = '5.6' ]; then - mysql_install_db --datadir="$DATADIR" --rpm --keep-my-cnf "${@:2}" --default-time-zone=SYSTEM - else - "$@" --initialize-insecure --default-time-zone=SYSTEM - fi - mysql_note "Database files initialized" - - if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then - # https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84 - mysql_note "Initializing certificates" - mysql_ssl_rsa_setup --datadir="$DATADIR" - mysql_note "Certificates initialized" - fi -} - -# Loads various settings that are used elsewhere in the script -# This should be called after mysql_check_config, but before any other functions -docker_setup_env() { - # Get config - declare -g DATADIR SOCKET - DATADIR="$(mysql_get_config 'datadir' "$@")" - SOCKET="$(mysql_get_config 'socket' "$@")" - - # Initialize values that might be stored in a file - file_env 'MYSQL_ROOT_HOST' '%' - file_env 'MYSQL_DATABASE' - file_env 'MYSQL_USER' - file_env 'MYSQL_PASSWORD' - file_env 'MYSQL_ROOT_PASSWORD' - - declare -g DATABASE_ALREADY_EXISTS - if [ -d "$DATADIR/mysql" ]; then - DATABASE_ALREADY_EXISTS='true' - fi -} - -# Execute sql script, passed via stdin -# usage: docker_process_sql [--dont-use-mysql-root-password] [mysql-cli-args] -# ie: docker_process_sql --database=mydb <<<'INSERT ...' -# ie: docker_process_sql --dont-use-mysql-root-password --database=mydb /dev/null - - docker_init_database_dir "$@" - - mysql_note "Starting temporary server" - docker_temp_server_start "$@" - mysql_note "Temporary server started." - - docker_setup_db - docker_process_init_files /docker-entrypoint-initdb.d/* - - mysql_expire_root_user - - mysql_note "Stopping temporary server" - docker_temp_server_stop - mysql_note "Temporary server stopped" - - echo - mysql_note "MySQL init process done. Ready for start up." - echo - fi - fi - exec "$@" -} - -# If we are sourced from elsewhere, don't perform any further actions -if ! _is_sourced; then - _main "$@" -fi diff --git a/5.7/Dockerfile.debian b/5.7/Dockerfile.debian index 531cacb8f..170e10730 100644 --- a/5.7/Dockerfile.debian +++ b/5.7/Dockerfile.debian @@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* RUN set -ex; \ -# gpg: key 5072E1F5: public key "MySQL Release Engineering " imported - key='A4A9406876FCBD3C456770C88C718D3B5072E1F5'; \ +# gpg: key 3A79BD29: public key "MySQL Release Engineering " imported + key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \ @@ -62,7 +62,7 @@ RUN set -ex; \ apt-key list > /dev/null ENV MYSQL_MAJOR 5.7 -ENV MYSQL_VERSION 5.7.36-1debian10 +ENV MYSQL_VERSION 5.7.37-1debian10 RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh index 779aa3621..761da5349 100755 --- a/5.7/docker-entrypoint.sh +++ b/5.7/docker-entrypoint.sh @@ -106,7 +106,7 @@ mysql_get_config() { # Do a temporary startup of the MySQL server, for init purposes docker_temp_server_start() { - if [ "${MYSQL_MAJOR}" = '5.6' ] || [ "${MYSQL_MAJOR}" = '5.7' ]; then + if [ "${MYSQL_MAJOR}" = '5.7' ]; then "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" & mysql_note "Waiting for server startup" local i @@ -190,11 +190,7 @@ docker_create_db_directories() { # initializes the database directory docker_init_database_dir() { mysql_note "Initializing database files" - if [ "$MYSQL_MAJOR" = '5.6' ]; then - mysql_install_db --datadir="$DATADIR" --rpm --keep-my-cnf "${@:2}" --default-time-zone=SYSTEM - else - "$@" --initialize-insecure --default-time-zone=SYSTEM - fi + "$@" --initialize-insecure --default-time-zone=SYSTEM mysql_note "Database files initialized" if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then @@ -272,25 +268,10 @@ docker_setup_db() { fi local passwordSet= - if [ "$MYSQL_MAJOR" = '5.6' ]; then - # no, we don't care if read finds a terminating character in this heredoc (see above) - read -r -d '' passwordSet <<-EOSQL || true - DELETE FROM mysql.user WHERE user NOT IN ('mysql.sys', 'mysqlxsys', 'root') OR host NOT IN ('localhost') ; - SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${MYSQL_ROOT_PASSWORD}') ; - - -- 5.5: https://github.com/mysql/mysql-server/blob/e48d775c6f066add457fa8cfb2ebc4d5ff0c7613/scripts/mysql_secure_installation.sh#L192-L210 - -- 5.6: https://github.com/mysql/mysql-server/blob/06bc670db0c0e45b3ea11409382a5c315961f682/scripts/mysql_secure_installation.sh#L218-L236 - -- 5.7: https://github.com/mysql/mysql-server/blob/913071c0b16cc03e703308250d795bc381627e37/client/mysql_secure_installation.cc#L792-L818 - -- 8.0: https://github.com/mysql/mysql-server/blob/b93c1661d689c8b7decc7563ba15f6ed140a4eb6/client/mysql_secure_installation.cc#L726-L749 - DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%' ; - -- https://github.com/docker-library/mysql/pull/479#issuecomment-414561272 ("This is only needed for 5.5 and 5.6") - EOSQL - else - # no, we don't care if read finds a terminating character in this heredoc (see above) - read -r -d '' passwordSet <<-EOSQL || true - ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ; - EOSQL - fi + # no, we don't care if read finds a terminating character in this heredoc (see above) + read -r -d '' passwordSet <<-EOSQL || true + ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ; + EOSQL # tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is just now being set docker_process_sql --dont-use-mysql-root-password --database=mysql <<-EOSQL diff --git a/8.0/Dockerfile.debian b/8.0/Dockerfile.debian index afb88c771..18912ef4e 100644 --- a/8.0/Dockerfile.debian +++ b/8.0/Dockerfile.debian @@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* RUN set -ex; \ -# gpg: key 5072E1F5: public key "MySQL Release Engineering " imported - key='A4A9406876FCBD3C456770C88C718D3B5072E1F5'; \ +# gpg: key 3A79BD29: public key "MySQL Release Engineering " imported + key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \ @@ -62,7 +62,7 @@ RUN set -ex; \ apt-key list > /dev/null ENV MYSQL_MAJOR 8.0 -ENV MYSQL_VERSION 8.0.27-1debian10 +ENV MYSQL_VERSION 8.0.28-1debian10 RUN echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-8.0' > /etc/apt/sources.list.d/mysql.list diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh index 779aa3621..761da5349 100755 --- a/8.0/docker-entrypoint.sh +++ b/8.0/docker-entrypoint.sh @@ -106,7 +106,7 @@ mysql_get_config() { # Do a temporary startup of the MySQL server, for init purposes docker_temp_server_start() { - if [ "${MYSQL_MAJOR}" = '5.6' ] || [ "${MYSQL_MAJOR}" = '5.7' ]; then + if [ "${MYSQL_MAJOR}" = '5.7' ]; then "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" & mysql_note "Waiting for server startup" local i @@ -190,11 +190,7 @@ docker_create_db_directories() { # initializes the database directory docker_init_database_dir() { mysql_note "Initializing database files" - if [ "$MYSQL_MAJOR" = '5.6' ]; then - mysql_install_db --datadir="$DATADIR" --rpm --keep-my-cnf "${@:2}" --default-time-zone=SYSTEM - else - "$@" --initialize-insecure --default-time-zone=SYSTEM - fi + "$@" --initialize-insecure --default-time-zone=SYSTEM mysql_note "Database files initialized" if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then @@ -272,25 +268,10 @@ docker_setup_db() { fi local passwordSet= - if [ "$MYSQL_MAJOR" = '5.6' ]; then - # no, we don't care if read finds a terminating character in this heredoc (see above) - read -r -d '' passwordSet <<-EOSQL || true - DELETE FROM mysql.user WHERE user NOT IN ('mysql.sys', 'mysqlxsys', 'root') OR host NOT IN ('localhost') ; - SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${MYSQL_ROOT_PASSWORD}') ; - - -- 5.5: https://github.com/mysql/mysql-server/blob/e48d775c6f066add457fa8cfb2ebc4d5ff0c7613/scripts/mysql_secure_installation.sh#L192-L210 - -- 5.6: https://github.com/mysql/mysql-server/blob/06bc670db0c0e45b3ea11409382a5c315961f682/scripts/mysql_secure_installation.sh#L218-L236 - -- 5.7: https://github.com/mysql/mysql-server/blob/913071c0b16cc03e703308250d795bc381627e37/client/mysql_secure_installation.cc#L792-L818 - -- 8.0: https://github.com/mysql/mysql-server/blob/b93c1661d689c8b7decc7563ba15f6ed140a4eb6/client/mysql_secure_installation.cc#L726-L749 - DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%' ; - -- https://github.com/docker-library/mysql/pull/479#issuecomment-414561272 ("This is only needed for 5.5 and 5.6") - EOSQL - else - # no, we don't care if read finds a terminating character in this heredoc (see above) - read -r -d '' passwordSet <<-EOSQL || true - ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ; - EOSQL - fi + # no, we don't care if read finds a terminating character in this heredoc (see above) + read -r -d '' passwordSet <<-EOSQL || true + ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ; + EOSQL # tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is just now being set docker_process_sql --dont-use-mysql-root-password --database=mysql <<-EOSQL diff --git a/template/Dockerfile.debian b/template/Dockerfile.debian index 1e23aab7d..a8602095b 100644 --- a/template/Dockerfile.debian +++ b/template/Dockerfile.debian @@ -33,12 +33,8 @@ RUN mkdir /docker-entrypoint-initdb.d RUN apt-get update && apt-get install -y --no-install-recommends \ # for MYSQL_RANDOM_ROOT_PASSWORD pwgen \ -{{ - if env.version != "5.6" then ( --}} # for mysql_ssl_rsa_setup openssl \ -{{ ) else "" end -}} # FATAL ERROR: please install the following Perl modules before executing /usr/local/mysql/scripts/mysql_install_db: # File::Basename # File::Copy @@ -50,8 +46,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* RUN set -ex; \ -# gpg: key 5072E1F5: public key "MySQL Release Engineering " imported - key='A4A9406876FCBD3C456770C88C718D3B5072E1F5'; \ +# gpg: key 3A79BD29: public key "MySQL Release Engineering " imported + key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \ @@ -74,7 +70,7 @@ RUN { \ } | debconf-set-selections \ && apt-get update \ && apt-get install -y \ -{{ if env.version == "5.6" or env.version == "5.7" then ( -}} +{{ if env.version == "5.7" then ( -}} mysql-server="${MYSQL_VERSION}" \ # comment out a few problematic configuration values && find /etc/mysql/ -name '*.cnf' -print0 \ @@ -94,7 +90,7 @@ RUN { \ VOLUME /var/lib/mysql -{{ if env.version != "5.6" and env.version != "5.7" then ( -}} +{{ if env.version != "5.7" then ( -}} # Config files COPY config/ /etc/mysql/ {{ ) else "" end -}} @@ -102,9 +98,5 @@ COPY docker-entrypoint.sh /usr/local/bin/ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat ENTRYPOINT ["docker-entrypoint.sh"] -{{ if env.version != "5.6" then ( -}} EXPOSE 3306 33060 -{{ ) else ( -}} -EXPOSE 3306 -{{ ) end -}} CMD ["mysqld"] diff --git a/template/docker-entrypoint.sh b/template/docker-entrypoint.sh index 779aa3621..761da5349 100755 --- a/template/docker-entrypoint.sh +++ b/template/docker-entrypoint.sh @@ -106,7 +106,7 @@ mysql_get_config() { # Do a temporary startup of the MySQL server, for init purposes docker_temp_server_start() { - if [ "${MYSQL_MAJOR}" = '5.6' ] || [ "${MYSQL_MAJOR}" = '5.7' ]; then + if [ "${MYSQL_MAJOR}" = '5.7' ]; then "$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" & mysql_note "Waiting for server startup" local i @@ -190,11 +190,7 @@ docker_create_db_directories() { # initializes the database directory docker_init_database_dir() { mysql_note "Initializing database files" - if [ "$MYSQL_MAJOR" = '5.6' ]; then - mysql_install_db --datadir="$DATADIR" --rpm --keep-my-cnf "${@:2}" --default-time-zone=SYSTEM - else - "$@" --initialize-insecure --default-time-zone=SYSTEM - fi + "$@" --initialize-insecure --default-time-zone=SYSTEM mysql_note "Database files initialized" if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e "$DATADIR/server-key.pem" ]; then @@ -272,25 +268,10 @@ docker_setup_db() { fi local passwordSet= - if [ "$MYSQL_MAJOR" = '5.6' ]; then - # no, we don't care if read finds a terminating character in this heredoc (see above) - read -r -d '' passwordSet <<-EOSQL || true - DELETE FROM mysql.user WHERE user NOT IN ('mysql.sys', 'mysqlxsys', 'root') OR host NOT IN ('localhost') ; - SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${MYSQL_ROOT_PASSWORD}') ; - - -- 5.5: https://github.com/mysql/mysql-server/blob/e48d775c6f066add457fa8cfb2ebc4d5ff0c7613/scripts/mysql_secure_installation.sh#L192-L210 - -- 5.6: https://github.com/mysql/mysql-server/blob/06bc670db0c0e45b3ea11409382a5c315961f682/scripts/mysql_secure_installation.sh#L218-L236 - -- 5.7: https://github.com/mysql/mysql-server/blob/913071c0b16cc03e703308250d795bc381627e37/client/mysql_secure_installation.cc#L792-L818 - -- 8.0: https://github.com/mysql/mysql-server/blob/b93c1661d689c8b7decc7563ba15f6ed140a4eb6/client/mysql_secure_installation.cc#L726-L749 - DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%' ; - -- https://github.com/docker-library/mysql/pull/479#issuecomment-414561272 ("This is only needed for 5.5 and 5.6") - EOSQL - else - # no, we don't care if read finds a terminating character in this heredoc (see above) - read -r -d '' passwordSet <<-EOSQL || true - ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ; - EOSQL - fi + # no, we don't care if read finds a terminating character in this heredoc (see above) + read -r -d '' passwordSet <<-EOSQL || true + ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ; + EOSQL # tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is just now being set docker_process_sql --dont-use-mysql-root-password --database=mysql <<-EOSQL diff --git a/versions.json b/versions.json index c2c02db5d..4f787cb5a 100644 --- a/versions.json +++ b/versions.json @@ -1,23 +1,13 @@ { - "5.6": { - "debian": { - "architectures": [ - "amd64" - ], - "suite": "stretch", - "version": "5.6.51-1debian9" - }, - "version": "5.6.51" - }, "5.7": { "debian": { "architectures": [ "amd64" ], "suite": "buster", - "version": "5.7.36-1debian10" + "version": "5.7.37-1debian10" }, - "version": "5.7.36" + "version": "5.7.37" }, "8.0": { "debian": { @@ -25,8 +15,8 @@ "amd64" ], "suite": "buster", - "version": "8.0.27-1debian10" + "version": "8.0.28-1debian10" }, - "version": "8.0.27" + "version": "8.0.28" } } diff --git a/versions.sh b/versions.sh index e475d0b78..a9b951e5d 100755 --- a/versions.sh +++ b/versions.sh @@ -3,7 +3,7 @@ set -Eeuo pipefail defaultDebianSuite='buster' declare -A debianSuites=( - [5.6]='stretch' + #[5.6]='stretch' ) cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"