diff --git a/5.7/Dockerfile.debian b/5.7/Dockerfile.debian deleted file mode 100644 index 8153f43d7..000000000 --- a/5.7/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:buster-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.16 -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; \ -# gpg: key 3A79BD29: public key "MySQL Release Engineering " imported - key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \ - 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 5.7 -ENV MYSQL_VERSION 5.7.42-1debian10 - -RUN echo 'deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /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 33060 -CMD ["mysqld"] diff --git a/5.7/Dockerfile.oracle b/5.7/Dockerfile.oracle index 38169b98e..07a3a703f 100644 --- a/5.7/Dockerfile.oracle +++ b/5.7/Dockerfile.oracle @@ -53,7 +53,7 @@ RUN set -eux; \ rm -rf "$GNUPGHOME" ENV MYSQL_MAJOR 5.7 -ENV MYSQL_VERSION 5.7.42-1.el7 +ENV MYSQL_VERSION 5.7.43-1.el7 RUN set -eu; \ . /etc/os-release; \ diff --git a/apply-templates.sh b/apply-templates.sh index 05db7e521..ee553ff8f 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -32,6 +32,8 @@ generated_warning() { for version; do export version + rm -f "$version"/Dockerfile.* + for variant in oracle debian; do export variant diff --git a/versions.json b/versions.json index 4aa4457d5..b5a8fad25 100644 --- a/versions.json +++ b/versions.json @@ -1,12 +1,5 @@ { "5.7": { - "debian": { - "architectures": [ - "amd64" - ], - "suite": "buster", - "version": "5.7.42-1debian10" - }, "mysql-shell": { "version": "8.0.34-1.el7" }, @@ -15,9 +8,9 @@ "amd64" ], "variant": "7-slim", - "version": "5.7.42-1.el7" + "version": "5.7.43-1.el7" }, - "version": "5.7.42" + "version": "5.7.43" }, "8.0": { "debian": { diff --git a/versions.sh b/versions.sh index 8f5a2054b..a76f2b1a7 100755 --- a/versions.sh +++ b/versions.sh @@ -54,7 +54,7 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" versions=( "$@" ) if [ ${#versions[@]} -eq 0 ]; then - versions=( *.*/ ) + versions=( */ ) json='{}' else json="$(< versions.json)" @@ -62,11 +62,12 @@ fi versions=( "${versions[@]%/}" ) for version in "${versions[@]}"; do + [ "$version" != 'template' ] || continue export version doc='{}' - if [[ "$version" == 5.* ]] || [ "$version" = '8.0' ]; then + 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" \