Move things around so 9.4 can be consistent with 9.3

This commit is contained in:
Tianon Gravi 2014-07-15 18:14:06 -06:00
parent 9375cde556
commit 2bfa44dab2
1 changed files with 4 additions and 4 deletions

View File

@ -8,13 +8,13 @@ RUN apt-get update && apt-get install -y curl
RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \
&& chmod +x /usr/local/bin/gosu
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
&& curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
| apt-key add - ED6D65271AACF0FF15D123036FB2A1C265FFB764
ENV PG_MAJOR 9.3
ENV PG_VERSION 9.3.4-1.pgdg70+1
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list \
&& curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
| apt-key add - ED6D65271AACF0FF15D123036FB2A1C265FFB764
RUN apt-get update \
&& apt-get install -y postgresql-common \
&& sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf \