From 65ad3beacf33c30aed283c66d3668fe5074578db Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 3 Feb 2015 10:40:20 +0530 Subject: [PATCH] dockerfile: define PG_VERSION as an ENV variable --- Dockerfile | 3 ++- start | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75c1532..1d65287 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ FROM sameersbn/ubuntu:14.04.20150120 MAINTAINER sameer@damagehead.com +ENV PG_VERSION 9.1 RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && apt-get update \ - && apt-get install -y postgresql-9.1 postgresql-client-9.1 pwgen \ + && apt-get install -y postgresql-${PG_VERSION} postgresql-client-${PG_VERSION} pwgen \ && rm -rf /var/lib/postgresql \ && rm -rf /var/lib/apt/lists/* # 20141001 diff --git a/start b/start index 434531a..ee68e6c 100755 --- a/start +++ b/start @@ -1,7 +1,6 @@ #!/bin/bash set -e -PG_VERSION="9.1" PG_CONFDIR="/etc/postgresql/${PG_VERSION}/main" PG_BINDIR="/usr/lib/postgresql/${PG_VERSION}/bin" PG_DATADIR="/var/lib/postgresql/${PG_VERSION}/main"