From 80ebeda0a68be6a8b10ce0de1846a49228af0795 Mon Sep 17 00:00:00 2001 From: Mateusz Marzantowicz Date: Tue, 18 Nov 2014 23:25:15 +0100 Subject: [PATCH] Explicitly create /docker-entrypoint-initdb.d directory --- 8.4/Dockerfile | 2 ++ 9.0/Dockerfile | 2 ++ 9.1/Dockerfile | 2 ++ 9.2/Dockerfile | 2 ++ 9.3/Dockerfile | 2 ++ 9.4/Dockerfile | 2 ++ Dockerfile.template | 2 ++ 7 files changed, 14 insertions(+) diff --git a/8.4/Dockerfile b/8.4/Dockerfile index d3be0ad934..78463390f0 100644 --- a/8.4/Dockerfile +++ b/8.4/Dockerfile @@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG en_US.utf8 +RUN mkdir /docker-entrypoint-initdb.d + RUN apt-key adv --keyserver pgp.mit.edu --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 8.4 diff --git a/9.0/Dockerfile b/9.0/Dockerfile index 9274944985..c901d41048 100644 --- a/9.0/Dockerfile +++ b/9.0/Dockerfile @@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG en_US.utf8 +RUN mkdir /docker-entrypoint-initdb.d + RUN apt-key adv --keyserver pgp.mit.edu --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.0 diff --git a/9.1/Dockerfile b/9.1/Dockerfile index b58fbdd6e7..683f8ba2b2 100644 --- a/9.1/Dockerfile +++ b/9.1/Dockerfile @@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG en_US.utf8 +RUN mkdir /docker-entrypoint-initdb.d + RUN apt-key adv --keyserver pgp.mit.edu --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.1 diff --git a/9.2/Dockerfile b/9.2/Dockerfile index 91bd7a326c..b321cbf651 100644 --- a/9.2/Dockerfile +++ b/9.2/Dockerfile @@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG en_US.utf8 +RUN mkdir /docker-entrypoint-initdb.d + RUN apt-key adv --keyserver pgp.mit.edu --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.2 diff --git a/9.3/Dockerfile b/9.3/Dockerfile index 487e748bd5..df835918af 100644 --- a/9.3/Dockerfile +++ b/9.3/Dockerfile @@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG en_US.utf8 +RUN mkdir /docker-entrypoint-initdb.d + RUN apt-key adv --keyserver pgp.mit.edu --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.3 diff --git a/9.4/Dockerfile b/9.4/Dockerfile index fcf9b90bc8..346877656f 100644 --- a/9.4/Dockerfile +++ b/9.4/Dockerfile @@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG en_US.utf8 +RUN mkdir /docker-entrypoint-initdb.d + RUN apt-key adv --keyserver pgp.mit.edu --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.4 diff --git a/Dockerfile.template b/Dockerfile.template index 9d86078a9f..b4511a89d8 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG en_US.utf8 +RUN mkdir /docker-entrypoint-initdb.d + RUN apt-key adv --keyserver pgp.mit.edu --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR %%PG_MAJOR%%