Skip to content

Commit

Permalink
Merge pull request #627 from inductor/feature/update_debian_buster
Browse files Browse the repository at this point in the history
update debian base version to buster
  • Loading branch information
tianon authored Mar 2, 2020
2 parents a77d4a5 + 202bf4b commit 756df2e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions 5.7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:stretch-slim
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
Expand Down Expand Up @@ -48,9 +48,9 @@ RUN set -ex; \
apt-key list > /dev/null

ENV MYSQL_MAJOR 5.7
ENV MYSQL_VERSION 5.7.29-1debian9
ENV MYSQL_VERSION 5.7.29-1debian10

RUN echo "deb http://repo.mysql.com/apt/debian/ stretch mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
RUN echo "deb http://repo.mysql.com/apt/debian/ buster mysql-${MYSQL_MAJOR}" > /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
Expand Down
6 changes: 3 additions & 3 deletions 8.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:stretch-slim
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
Expand Down Expand Up @@ -48,9 +48,9 @@ RUN set -ex; \
apt-key list > /dev/null

ENV MYSQL_MAJOR 8.0
ENV MYSQL_VERSION 8.0.19-1debian9
ENV MYSQL_VERSION 8.0.19-1debian10

RUN echo "deb http://repo.mysql.com/apt/debian/ stretch mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
RUN echo "deb http://repo.mysql.com/apt/debian/ buster mysql-${MYSQL_MAJOR}" > /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
Expand Down
6 changes: 3 additions & 3 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ if [ ${#versions[@]} -eq 0 ]; then
fi
versions=( "${versions[@]%/}" )

defaultDebianVariant='stretch-slim'
defaultDebianVariant='buster-slim'
declare -A debianVariants=(
#[5.5]='jessie'
[5.6]='stretch-slim'
)

for version in "${versions[@]}"; do
debianVariant="${debianVariants[$version]:-$defaultDebianVariant}"
debianSuite="${debianVariant%%-*}" # "stretch", etc
debianSuite="${debianVariant%%-*}" # "buster", etc

cp -a .template.Debian/docker-entrypoint.sh "$version/docker-entrypoint.sh"

Expand Down

0 comments on commit 756df2e

Please sign in to comment.