Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request #67 from infosiftr/stretch
Browse files Browse the repository at this point in the history
Update from jessie to stretch
  • Loading branch information
tianon committed Jul 30, 2018
2 parents 5236af9 + dacba41 commit 736d1eb
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions 5.5/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions 5.6/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions 5.7/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -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%%
Expand Down
4 changes: 2 additions & 2 deletions update.sh
Original file line number Diff line number Diff line change
@@ -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'
Expand Down

0 comments on commit 736d1eb

Please sign in to comment.