From dacba4148dfdda9f0ff28cd2a42117c0ee3b86b2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 30 Jul 2018 14:06:56 -0700 Subject: [PATCH] Update from jessie to stretch --- 5.5/Dockerfile | 8 ++++---- 5.6/Dockerfile | 8 ++++---- 5.7/Dockerfile | 8 ++++---- Dockerfile.template | 2 +- update.sh | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/5.5/Dockerfile b/5.5/Dockerfile index 743007c..b8feeef 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM debian:jessie +FROM debian:stretch # 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 @@ -76,11 +76,11 @@ RUN set -ex; \ rm -r "$GNUPGHOME"; \ apt-key list -RUN echo 'deb https://repo.percona.com/apt jessie main' > /etc/apt/sources.list.d/percona.list +RUN echo 'deb https://repo.percona.com/apt stretch main' > /etc/apt/sources.list.d/percona.list -# bashbrew-architectures: amd64 i386 +# bashbrew-architectures: amd64 ENV PERCONA_MAJOR 5.5 -ENV PERCONA_VERSION 5.5.60-rel38.12-1.jessie +ENV PERCONA_VERSION 5.5.60-rel38.12-1.stretch # 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 diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 60d1fb9..356946e 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM debian:jessie +FROM debian:stretch # 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 @@ -76,11 +76,11 @@ RUN set -ex; \ rm -r "$GNUPGHOME"; \ apt-key list -RUN echo 'deb https://repo.percona.com/apt jessie main' > /etc/apt/sources.list.d/percona.list +RUN echo 'deb https://repo.percona.com/apt stretch main' > /etc/apt/sources.list.d/percona.list -# bashbrew-architectures: amd64 i386 +# bashbrew-architectures: amd64 ENV PERCONA_MAJOR 5.6 -ENV PERCONA_VERSION 5.6.40-84.0-1.jessie +ENV PERCONA_VERSION 5.6.40-84.0-1.stretch # 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 diff --git a/5.7/Dockerfile b/5.7/Dockerfile index 8f4aa66..9c80164 100644 --- a/5.7/Dockerfile +++ b/5.7/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM debian:jessie +FROM debian:stretch # 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 @@ -76,11 +76,11 @@ RUN set -ex; \ rm -r "$GNUPGHOME"; \ apt-key list -RUN echo 'deb https://repo.percona.com/apt jessie main' > /etc/apt/sources.list.d/percona.list +RUN echo 'deb https://repo.percona.com/apt stretch main' > /etc/apt/sources.list.d/percona.list -# bashbrew-architectures: amd64 i386 +# bashbrew-architectures: amd64 ENV PERCONA_MAJOR 5.7 -ENV PERCONA_VERSION 5.7.22-22-1.jessie +ENV PERCONA_VERSION 5.7.22-22-1.stretch # 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 diff --git a/Dockerfile.template b/Dockerfile.template index f093087..6303a03 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -76,7 +76,7 @@ RUN set -ex; \ rm -r "$GNUPGHOME"; \ apt-key list -RUN echo 'deb https://repo.percona.com/apt jessie main' > /etc/apt/sources.list.d/percona.list +RUN echo 'deb https://repo.percona.com/apt %%SUITE%% main' > /etc/apt/sources.list.d/percona.list # bashbrew-architectures:%%ARCHES%% ENV PERCONA_MAJOR %%PERCONA_MAJOR%% diff --git a/update.sh b/update.sh index e51eedb..2ce94fe 100755 --- a/update.sh +++ b/update.sh @@ -1,9 +1,9 @@ #!/bin/bash set -eo pipefail -defaultSuite='jessie' +defaultSuite='stretch' declare -A suites=( -# [5.7]='stretch' + #[5.5]='jessie' ) declare -A dpkgArchToBashbrew=( [amd64]='amd64'