From cb70a79c1a8248d7e0db89d79dfbd08dd481be7f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 8 Jul 2015 09:55:30 -0700 Subject: [PATCH] Switch from "wheezy" over to "jessie" --- 9.0/Dockerfile | 6 +++--- 9.1/Dockerfile | 6 +++--- 9.2/Dockerfile | 6 +++--- 9.3/Dockerfile | 6 +++--- 9.4/Dockerfile | 6 +++--- 9.5/Dockerfile | 6 +++--- Dockerfile.template | 4 ++-- update.sh | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/9.0/Dockerfile b/9.0/Dockerfile index a40297e84c..5e7c4d98e3 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM debian:wheezy +FROM debian:jessie # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r postgres && useradd -r -g postgres postgres @@ -24,9 +24,9 @@ RUN mkdir /docker-entrypoint-initdb.d RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.0 -ENV PG_VERSION 9.0.22-1.pgdg70+1 +ENV PG_VERSION 9.0.22-1.pgdg80+1 -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list RUN apt-get update \ && apt-get install -y postgresql-common \ diff --git a/9.1/Dockerfile b/9.1/Dockerfile index c4026e78eb..a7dd90e8e1 100644 --- a/9.1/Dockerfile +++ b/9.1/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM debian:wheezy +FROM debian:jessie # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r postgres && useradd -r -g postgres postgres @@ -24,9 +24,9 @@ RUN mkdir /docker-entrypoint-initdb.d RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.1 -ENV PG_VERSION 9.1.18-1.pgdg70+1 +ENV PG_VERSION 9.1.18-1.pgdg80+1 -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list RUN apt-get update \ && apt-get install -y postgresql-common \ diff --git a/9.2/Dockerfile b/9.2/Dockerfile index 7bb6426a6f..e6a339278a 100644 --- a/9.2/Dockerfile +++ b/9.2/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM debian:wheezy +FROM debian:jessie # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r postgres && useradd -r -g postgres postgres @@ -24,9 +24,9 @@ RUN mkdir /docker-entrypoint-initdb.d RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.2 -ENV PG_VERSION 9.2.13-1.pgdg70+1 +ENV PG_VERSION 9.2.13-1.pgdg80+1 -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list RUN apt-get update \ && apt-get install -y postgresql-common \ diff --git a/9.3/Dockerfile b/9.3/Dockerfile index f3066be97c..e1274cd364 100644 --- a/9.3/Dockerfile +++ b/9.3/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM debian:wheezy +FROM debian:jessie # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r postgres && useradd -r -g postgres postgres @@ -24,9 +24,9 @@ RUN mkdir /docker-entrypoint-initdb.d RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.3 -ENV PG_VERSION 9.3.9-1.pgdg70+1 +ENV PG_VERSION 9.3.9-1.pgdg80+1 -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list RUN apt-get update \ && apt-get install -y postgresql-common \ diff --git a/9.4/Dockerfile b/9.4/Dockerfile index 41a124431d..58afef51df 100644 --- a/9.4/Dockerfile +++ b/9.4/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM debian:wheezy +FROM debian:jessie # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r postgres && useradd -r -g postgres postgres @@ -24,9 +24,9 @@ RUN mkdir /docker-entrypoint-initdb.d RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.4 -ENV PG_VERSION 9.4.4-1.pgdg70+1 +ENV PG_VERSION 9.4.4-1.pgdg80+1 -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list RUN apt-get update \ && apt-get install -y postgresql-common \ diff --git a/9.5/Dockerfile b/9.5/Dockerfile index bbc9c03ac5..fbc1ca6abb 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM debian:wheezy +FROM debian:jessie # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r postgres && useradd -r -g postgres postgres @@ -24,9 +24,9 @@ RUN mkdir /docker-entrypoint-initdb.d RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.5 -ENV PG_VERSION 9.5~alpha1-1.pgdg70+1 +ENV PG_VERSION 9.5~alpha1-1.pgdg80+1 -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list RUN apt-get update \ && apt-get install -y postgresql-common \ diff --git a/Dockerfile.template b/Dockerfile.template index 608e7c1d01..dfb1ada3d7 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM debian:wheezy +FROM debian:jessie # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r postgres && useradd -r -g postgres postgres @@ -26,7 +26,7 @@ RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A4 ENV PG_MAJOR %%PG_MAJOR%% ENV PG_VERSION %%PG_VERSION%% -RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list +RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list RUN apt-get update \ && apt-get install -y postgresql-common \ diff --git a/update.sh b/update.sh index 649d716199..17da65ab6b 100755 --- a/update.sh +++ b/update.sh @@ -9,7 +9,7 @@ if [ ${#versions[@]} -eq 0 ]; then fi versions=( "${versions[@]%/}" ) -packagesUrl='http://apt.postgresql.org/pub/repos/apt/dists/wheezy-pgdg/main/binary-amd64/Packages' +packagesUrl='http://apt.postgresql.org/pub/repos/apt/dists/jessie-pgdg/main/binary-amd64/Packages' packages="$(echo "$packagesUrl" | sed -r 's/[^a-zA-Z.-]+/-/g')" curl -sSL "${packagesUrl}.bz2" | bunzip2 > "$packages"