diff --git a/8.0/Dockerfile.debian b/8.0/Dockerfile.debian deleted file mode 100644 index 743dd55bf..000000000 --- a/8.0/Dockerfile.debian +++ /dev/null @@ -1,100 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bookworm-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 && rm -rf /var/lib/apt/lists/* - -# add gosu for easy step-down from root -# https://github.com/tianon/gosu/releases -ENV GOSU_VERSION 1.19 -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 set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - openssl \ -# 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 \ - xz-utils \ - zstd \ - ; \ - rm -rf /var/lib/apt/lists/* - -RUN set -eux; \ -# pub rsa4096 2023-10-23 [SC] [expires: 2027-10-23] -# BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C -# uid [ unknown] MySQL Release Engineering -# sub rsa4096 2023-10-23 [E] [expires: 2027-10-23] - key='BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C'; \ - export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /etc/apt/keyrings; \ - gpg --batch --export "$key" > /etc/apt/keyrings/mysql.gpg; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" - -ENV MYSQL_MAJOR 8.0 -ENV MYSQL_VERSION 8.0.46-1debian12 - -RUN echo 'deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ bookworm mysql-8.0' > /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-community-client="${MYSQL_VERSION}" \ - mysql-community-server-core="${MYSQL_VERSION}" \ - && 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 - -# Config files -COPY config/ /etc/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 33060 -CMD ["mysqld"] diff --git a/8.0/Dockerfile.oracle b/8.0/Dockerfile.oracle deleted file mode 100644 index 6c6e12b0b..000000000 --- a/8.0/Dockerfile.oracle +++ /dev/null @@ -1,124 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM oraclelinux:9-slim - -RUN set -eux; \ - groupadd --system --gid 999 mysql; \ - useradd --system --uid 999 --gid 999 --home-dir /var/lib/mysql --no-create-home mysql - -# add gosu for easy step-down from root -# https://github.com/tianon/gosu/releases -ENV GOSU_VERSION 1.19 -RUN set -eux; \ -# TODO find a better userspace architecture detection method than querying the kernel - arch="$(uname -m)"; \ - case "$arch" in \ - aarch64) gosuArch='arm64' ;; \ - x86_64) gosuArch='amd64' ;; \ - *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ - esac; \ - curl -fL -o /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$gosuArch.asc"; \ - curl -fL -o /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$gosuArch"; \ - 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; \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ - chmod +x /usr/local/bin/gosu; \ - gosu --version; \ - gosu nobody true - -RUN set -eux; \ - microdnf install -y \ - bzip2 \ - gzip \ - openssl \ - xz \ - zstd \ -# Oracle Linux 8+ is very slim :) - findutils \ - ; \ - microdnf clean all - -RUN set -eux; \ -# https://dev.mysql.com/doc/refman/8.0/en/checking-gpg-signature.html -# pub rsa4096 2023-10-23 [SC] [expires: 2025-10-22] -# BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C -# uid [ unknown] MySQL Release Engineering -# sub rsa4096 2023-10-23 [E] [expires: 2025-10-22] - key='BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C'; \ - export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - gpg --batch --export --armor "$key" > /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql; \ - rm -rf "$GNUPGHOME" - -ENV MYSQL_MAJOR 8.0 -ENV MYSQL_VERSION 8.0.46-1.el9 - -RUN set -eu; \ - { \ - echo '[mysql8.0-server-minimal]'; \ - echo 'name=MySQL 8.0 Server Minimal'; \ - echo 'enabled=1'; \ - echo 'baseurl=https://repo.mysql.com/yum/mysql-8.0-community/docker/el/9/$basearch/'; \ - echo 'gpgcheck=1'; \ - echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql'; \ -# https://github.com/docker-library/mysql/pull/680#issuecomment-825930524 - echo 'module_hotfixes=true'; \ - } | tee /etc/yum.repos.d/mysql-community-minimal.repo - -RUN set -eux; \ - microdnf install -y "mysql-community-server-minimal-$MYSQL_VERSION"; \ - microdnf clean all; \ -# the "socket" value in the Oracle packages is set to "/var/lib/mysql" which isn't a great place for the socket (we want it in "/var/run/mysqld" instead) -# https://github.com/docker-library/mysql/pull/680#issuecomment-636121520 - grep -F 'socket=/var/lib/mysql/mysql.sock' /etc/my.cnf; \ - sed -i 's!^socket=.*!socket=/var/run/mysqld/mysqld.sock!' /etc/my.cnf; \ - grep -F 'socket=/var/run/mysqld/mysqld.sock' /etc/my.cnf; \ - { echo '[client]'; echo 'socket=/var/run/mysqld/mysqld.sock'; } >> /etc/my.cnf; \ - \ -# make sure users dumping files in "/etc/mysql/conf.d" still works - ! grep -F '!includedir' /etc/my.cnf; \ - { echo; echo '!includedir /etc/mysql/conf.d/'; } >> /etc/my.cnf; \ - mkdir -p /etc/mysql/conf.d; \ -# ensure these directories exist and have useful permissions -# the rpm package has different opinions on the mode of `/var/run/mysqld`, so this needs to be after install - mkdir -p /var/lib/mysql /var/run/mysqld; \ - chown 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/lib/mysql /var/run/mysqld; \ - \ - mkdir /docker-entrypoint-initdb.d; \ - \ - mysqld --version; \ - mysql --version - -RUN set -eu; \ - { \ - echo '[mysql-tools-community]'; \ - echo 'name=MySQL Tools Community'; \ - echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-community/el/9/$basearch/'; \ - echo 'enabled=1'; \ - echo 'gpgcheck=1'; \ - echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql'; \ -# https://github.com/docker-library/mysql/pull/680#issuecomment-825930524 - echo 'module_hotfixes=true'; \ - } | tee /etc/yum.repos.d/mysql-community-tools.repo -ENV MYSQL_SHELL_VERSION 8.0.46-1.el9 -RUN set -eux; \ - microdnf install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \ - microdnf clean all; \ - \ - mysqlsh --version - -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 33060 -CMD ["mysqld"] diff --git a/8.0/config/conf.d/docker.cnf b/8.0/config/conf.d/docker.cnf deleted file mode 100644 index 205bedb54..000000000 --- a/8.0/config/conf.d/docker.cnf +++ /dev/null @@ -1,3 +0,0 @@ -[mysqld] -host_cache_size=0 -skip-name-resolve diff --git a/8.0/config/my.cnf b/8.0/config/my.cnf deleted file mode 100644 index 1f2511ce6..000000000 --- a/8.0/config/my.cnf +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# -# The MySQL Server configuration file. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -[mysqld] -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -datadir = /var/lib/mysql -secure-file-priv= NULL - -# Custom config should go here -!includedir /etc/mysql/conf.d/ diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh deleted file mode 100755 index 0927b5ff8..000000000 --- a/8.0/docker-entrypoint.sh +++ /dev/null @@ -1,420 +0,0 @@ -#!/usr/bin/env 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.bz2) mysql_note "$0: running $f"; bunzip2 -c "$f" | docker_process_sql; 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 ;; - *.sql.zst) mysql_note "$0: running $f"; zstd -dc "$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)" -} - -# Ensure that the package default socket can also be used -# since rpm packages are compiled with a different socket location -# and "mysqlsh --mysql" doesn't read the [client] config -# related to https://github.com/docker-library/mysql/issues/829 -mysql_socket_fix() { - local defaultSocket - defaultSocket="$(mysql_get_config 'socket' mysqld --no-defaults)" - if [ "$defaultSocket" != "$SOCKET" ]; then - ln -sfTv "$SOCKET" "$defaultSocket" || : - fi -} - -# Do a temporary startup of the MySQL server, for init purposes -docker_temp_server_start() { - # 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 -} - -# 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 as an environment variable: - - 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)" - - local -A dirs=( ["$DATADIR"]=1 ) - local dir - dir="$(dirname "$SOCKET")" - dirs["$dir"]=1 - - # "datadir" and "socket" are already handled above (since they were already queried previously) - local conf - for conf in \ - general-log-file \ - keyring_file_data \ - pid-file \ - secure-file-priv \ - slow-query-log-file \ - ; do - dir="$(mysql_get_config "$conf" "$@")" - - # skip empty values - if [ -z "$dir" ] || [ "$dir" = 'NULL' ]; then - continue - fi - case "$conf" in - secure-file-priv) - # already points at a directory - ;; - *) - # other config options point at a file, but we need the directory - dir="$(dirname "$dir")" - ;; - esac - - dirs["$dir"]=1 - done - - mkdir -p "${!dirs[@]}" - - if [ "$user" = "0" ]; then - # this will cause less disk access than `chown -R` - find "${!dirs[@]}" \! -user mysql -exec chown --no-dereference mysql '{}' + - fi -} - -# initializes the database directory -docker_init_database_dir() { - mysql_note "Initializing database files" - "$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1 - # explicitly enable autocommit to combat https://bugs.mysql.com/bug.php?id=110535 (TODO remove this when 8.0 is EOL; see https://github.com/mysql/mysql-server/commit/7dbf4f80ed15f3c925cfb2b834142f23a2de719a) - mysql_note "Database files initialized" -} - -# 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." - - mysql_socket_fix - 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 - else - mysql_socket_fix - fi - fi - exec "$@" -} - -# If we are sourced from elsewhere, don't perform any further actions -if ! _is_sourced; then - _main "$@" -fi diff --git a/8.4/Dockerfile.oracle b/8.4/Dockerfile.oracle index 0ea34975d..7ba6ae8b8 100644 --- a/8.4/Dockerfile.oracle +++ b/8.4/Dockerfile.oracle @@ -44,7 +44,7 @@ RUN set -eux; \ microdnf clean all RUN set -eux; \ -# https://dev.mysql.com/doc/refman/8.0/en/checking-gpg-signature.html +# https://dev.mysql.com/doc/refman/9.7/en/checking-gpg-signature.html # pub rsa4096 2023-10-23 [SC] [expires: 2025-10-22] # BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C # uid [ unknown] MySQL Release Engineering diff --git a/8.4/docker-entrypoint.sh b/8.4/docker-entrypoint.sh index 0927b5ff8..884774a91 100755 --- a/8.4/docker-entrypoint.sh +++ b/8.4/docker-entrypoint.sh @@ -214,8 +214,7 @@ docker_create_db_directories() { # initializes the database directory docker_init_database_dir() { mysql_note "Initializing database files" - "$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1 - # explicitly enable autocommit to combat https://bugs.mysql.com/bug.php?id=110535 (TODO remove this when 8.0 is EOL; see https://github.com/mysql/mysql-server/commit/7dbf4f80ed15f3c925cfb2b834142f23a2de719a) + "$@" --initialize-insecure --default-time-zone=SYSTEM mysql_note "Database files initialized" } diff --git a/9.7/Dockerfile.oracle b/9.7/Dockerfile.oracle index a7535e806..11037dfd0 100644 --- a/9.7/Dockerfile.oracle +++ b/9.7/Dockerfile.oracle @@ -44,7 +44,7 @@ RUN set -eux; \ microdnf clean all RUN set -eux; \ -# https://dev.mysql.com/doc/refman/8.0/en/checking-gpg-signature.html +# https://dev.mysql.com/doc/refman/9.7/en/checking-gpg-signature.html # pub rsa4096 2023-10-23 [SC] [expires: 2025-10-22] # BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C # uid [ unknown] MySQL Release Engineering diff --git a/9.7/docker-entrypoint.sh b/9.7/docker-entrypoint.sh index 0927b5ff8..884774a91 100755 --- a/9.7/docker-entrypoint.sh +++ b/9.7/docker-entrypoint.sh @@ -214,8 +214,7 @@ docker_create_db_directories() { # initializes the database directory docker_init_database_dir() { mysql_note "Initializing database files" - "$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1 - # explicitly enable autocommit to combat https://bugs.mysql.com/bug.php?id=110535 (TODO remove this when 8.0 is EOL; see https://github.com/mysql/mysql-server/commit/7dbf4f80ed15f3c925cfb2b834142f23a2de719a) + "$@" --initialize-insecure --default-time-zone=SYSTEM mysql_note "Database files initialized" } diff --git a/Dockerfile.debian b/Dockerfile.debian deleted file mode 100644 index 0db1ae04d..000000000 --- a/Dockerfile.debian +++ /dev/null @@ -1,96 +0,0 @@ -FROM debian:{{ .debian.suite }}-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 && rm -rf /var/lib/apt/lists/* - -# add gosu for easy step-down from root -# https://github.com/tianon/gosu/releases -ENV GOSU_VERSION 1.19 -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 set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - openssl \ -# 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 \ - xz-utils \ - zstd \ - ; \ - rm -rf /var/lib/apt/lists/* - -RUN set -eux; \ -# pub rsa4096 2023-10-23 [SC] [expires: 2027-10-23] -# BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C -# uid [ unknown] MySQL Release Engineering -# sub rsa4096 2023-10-23 [E] [expires: 2027-10-23] - key='BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C'; \ - export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /etc/apt/keyrings; \ - gpg --batch --export "$key" > /etc/apt/keyrings/mysql.gpg; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" - -ENV MYSQL_MAJOR {{ env.version }} -ENV MYSQL_VERSION {{ .debian.version }} - -RUN echo 'deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ {{ .debian.suite }} mysql-{{ env.version }}' > /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-community-client="${MYSQL_VERSION}" \ - mysql-community-server-core="${MYSQL_VERSION}" \ - && 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 - -# Config files -COPY config/ /etc/mysql/ -COPY docker-entrypoint.sh /usr/local/bin/ -{{ if env.version == "8.0" then ( -}} -RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat -{{ ) else "" end -}} -ENTRYPOINT ["docker-entrypoint.sh"] - -EXPOSE 3306 33060 -CMD ["mysqld"] diff --git a/Dockerfile.oracle b/Dockerfile.oracle index 01d9ba7fe..0abcd21f5 100644 --- a/Dockerfile.oracle +++ b/Dockerfile.oracle @@ -59,7 +59,7 @@ RUN set -eux; \ {{ dnf }} clean all RUN set -eux; \ -# https://dev.mysql.com/doc/refman/8.0/en/checking-gpg-signature.html +# https://dev.mysql.com/doc/refman/9.7/en/checking-gpg-signature.html # pub rsa4096 2023-10-23 [SC] [expires: 2025-10-22] # BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C # uid [ unknown] MySQL Release Engineering @@ -132,9 +132,6 @@ RUN set -eux; \ VOLUME /var/lib/mysql COPY docker-entrypoint.sh /usr/local/bin/ -{{ if env.version == "8.0" then ( -}} -RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat -{{ ) else "" end -}} ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 3306 33060 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 0927b5ff8..884774a91 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -214,8 +214,7 @@ docker_create_db_directories() { # initializes the database directory docker_init_database_dir() { mysql_note "Initializing database files" - "$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1 - # explicitly enable autocommit to combat https://bugs.mysql.com/bug.php?id=110535 (TODO remove this when 8.0 is EOL; see https://github.com/mysql/mysql-server/commit/7dbf4f80ed15f3c925cfb2b834142f23a2de719a) + "$@" --initialize-insecure --default-time-zone=SYSTEM mysql_note "Database files initialized" } diff --git a/innovation/Dockerfile.oracle b/innovation/Dockerfile.oracle index 39f4c11e0..dbf51aeab 100644 --- a/innovation/Dockerfile.oracle +++ b/innovation/Dockerfile.oracle @@ -44,7 +44,7 @@ RUN set -eux; \ microdnf clean all RUN set -eux; \ -# https://dev.mysql.com/doc/refman/8.0/en/checking-gpg-signature.html +# https://dev.mysql.com/doc/refman/9.7/en/checking-gpg-signature.html # pub rsa4096 2023-10-23 [SC] [expires: 2025-10-22] # BCA4 3417 C3B4 85DD 128E C6D4 B7B3 B788 A8D3 785C # uid [ unknown] MySQL Release Engineering diff --git a/innovation/docker-entrypoint.sh b/innovation/docker-entrypoint.sh index 0927b5ff8..884774a91 100755 --- a/innovation/docker-entrypoint.sh +++ b/innovation/docker-entrypoint.sh @@ -214,8 +214,7 @@ docker_create_db_directories() { # initializes the database directory docker_init_database_dir() { mysql_note "Initializing database files" - "$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1 - # explicitly enable autocommit to combat https://bugs.mysql.com/bug.php?id=110535 (TODO remove this when 8.0 is EOL; see https://github.com/mysql/mysql-server/commit/7dbf4f80ed15f3c925cfb2b834142f23a2de719a) + "$@" --initialize-insecure --default-time-zone=SYSTEM mysql_note "Database files initialized" } diff --git a/versions.json b/versions.json index 00b95004c..24893afba 100644 --- a/versions.json +++ b/versions.json @@ -46,28 +46,5 @@ "version": "8.4.9-1.el9" }, "version": "8.4.9" - }, - "8.0": { - "version": "8.0.46", - "debian": { - "architectures": [ - "amd64" - ], - "suite": "bookworm", - "version": "8.0.46-1debian12" - }, - "oracle": { - "architectures": [ - "amd64", - "arm64v8" - ], - "repo": "https://repo.mysql.com/yum/mysql-8.0-community/docker/el/9", - "version": "8.0.46-1.el9", - "variant": "9-slim" - }, - "mysql-shell": { - "repo": "https://repo.mysql.com/yum/mysql-tools-community/el/9", - "version": "8.0.46-1.el9" - } } } diff --git a/versions.sh b/versions.sh index b3632f69f..0dfee05aa 100755 --- a/versions.sh +++ b/versions.sh @@ -11,7 +11,7 @@ declare -A oracleVariants=( #[innovation]='8-slim' ) -# https://repo.mysql.com/yum/mysql-8.0-community/docker/ +# https://repo.mysql.com/yum/mysql-9.7-community/docker/ declare -A bashbrewArchToRpmArch=( [amd64]='x86_64' [arm64v8]='aarch64' @@ -66,48 +66,11 @@ for version in "${versions[@]}"; do doc='{}' - if [ "$version" = '8.0' ]; then - debianSuite="${debianSuites[$version]:-$defaultDebianSuite}" - debianVersion="$( - curl -fsSL "https://repo.mysql.com/apt/debian/dists/$debianSuite/mysql-$version/binary-amd64/Packages.gz" \ - | gunzip \ - | awk -F ': ' ' - $1 == "Package" { - pkg = $2 - next - } - pkg == "mysql-server" && $1 == "Version" { - print $2 - } - ' - )" - - # example 8.0.22-1debian10 => 8.0.22 - baseVersion="${debianVersion%-*}" - - export baseVersion debianSuite debianVersion - doc="$( - jq <<<"$doc" -c ' - . += { - version: env.baseVersion, - debian: { - architectures: [ "amd64" ], - suite: env.debianSuite, - version: env.debianVersion, - }, - } - ' - )" - fi - oracleVariant="${oracleVariants[$version]:-$defaultOracleVariant}" oracleVersion="${oracleVariant%%-*}" # "7", etc rpmRepo="https://repo.mysql.com/yum/mysql-$version-community/docker/el/$oracleVersion" - case "$version" in - 8.0) toolsRepo="https://repo.mysql.com/yum/mysql-tools-community/el/$oracleVersion" ;; - *) toolsRepo="https://repo.mysql.com/yum/mysql-tools-$version-community/el/$oracleVersion" ;; - esac + toolsRepo="https://repo.mysql.com/yum/mysql-tools-$version-community/el/$oracleVersion" export rpmRepo toolsRepo rpmVersion=