From d8abce4e82533aa2673da9ba9a5a8385589ed693 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 21 Jun 2017 17:01:35 -0700 Subject: [PATCH] Add gpg when necessary, ensure `prove` exists --- 10/Dockerfile | 10 ++++++++++ 10/alpine/Dockerfile | 3 ++- 9.2/Dockerfile | 10 ++++++++++ 9.2/alpine/Dockerfile | 1 + 9.3/Dockerfile | 10 ++++++++++ 9.3/alpine/Dockerfile | 1 + 9.4/Dockerfile | 10 ++++++++++ 9.4/alpine/Dockerfile | 1 + 9.5/Dockerfile | 10 ++++++++++ 9.5/alpine/Dockerfile | 1 + 9.6/Dockerfile | 10 ++++++++++ 9.6/alpine/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 10 ++++++++++ update.sh | 5 +++++ 15 files changed, 83 insertions(+), 1 deletion(-) diff --git a/10/Dockerfile b/10/Dockerfile index e5fca3b4d1..1f58c536f1 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -1,6 +1,16 @@ # vim:set ft=dockerfile: FROM debian:stretch +RUN set -ex; \ + if ! command -v gpg > /dev/null; then \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + gnupg2 \ + dirmngr \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + fi + # explicitly set user/group IDs RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 8f7e15c548..8103eaf4e4 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -56,7 +56,8 @@ RUN set -ex \ make \ # openldap-dev \ openssl-dev \ - perl \ +# configure: error: prove not found + perl-utils \ # perl-dev \ # python-dev \ # python3-dev \ diff --git a/9.2/Dockerfile b/9.2/Dockerfile index 7aa42ffac4..85c89ee820 100644 --- a/9.2/Dockerfile +++ b/9.2/Dockerfile @@ -1,6 +1,16 @@ # vim:set ft=dockerfile: FROM debian:jessie +RUN set -ex; \ + if ! command -v gpg > /dev/null; then \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + gnupg2 \ + dirmngr \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + fi + # explicitly set user/group IDs RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres diff --git a/9.2/alpine/Dockerfile b/9.2/alpine/Dockerfile index 21fc2de642..15099def3b 100644 --- a/9.2/alpine/Dockerfile +++ b/9.2/alpine/Dockerfile @@ -59,6 +59,7 @@ RUN set -ex \ make \ # openldap-dev \ openssl-dev \ +# configure: error: prove not found perl \ # perl-dev \ # python-dev \ diff --git a/9.3/Dockerfile b/9.3/Dockerfile index 002d9c4977..21a3cd6c2b 100644 --- a/9.3/Dockerfile +++ b/9.3/Dockerfile @@ -1,6 +1,16 @@ # vim:set ft=dockerfile: FROM debian:jessie +RUN set -ex; \ + if ! command -v gpg > /dev/null; then \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + gnupg2 \ + dirmngr \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + fi + # explicitly set user/group IDs RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile index 263867c0b0..423c69dfcd 100644 --- a/9.3/alpine/Dockerfile +++ b/9.3/alpine/Dockerfile @@ -59,6 +59,7 @@ RUN set -ex \ make \ # openldap-dev \ openssl-dev \ +# configure: error: prove not found perl \ # perl-dev \ # python-dev \ diff --git a/9.4/Dockerfile b/9.4/Dockerfile index 8b30ccbaa4..c503ba9279 100644 --- a/9.4/Dockerfile +++ b/9.4/Dockerfile @@ -1,6 +1,16 @@ # vim:set ft=dockerfile: FROM debian:jessie +RUN set -ex; \ + if ! command -v gpg > /dev/null; then \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + gnupg2 \ + dirmngr \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + fi + # explicitly set user/group IDs RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile index f9c2d07927..e24855a2d4 100644 --- a/9.4/alpine/Dockerfile +++ b/9.4/alpine/Dockerfile @@ -56,6 +56,7 @@ RUN set -ex \ make \ # openldap-dev \ openssl-dev \ +# configure: error: prove not found perl \ # perl-dev \ # python-dev \ diff --git a/9.5/Dockerfile b/9.5/Dockerfile index d53d589a6a..d7b27d2b5d 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -1,6 +1,16 @@ # vim:set ft=dockerfile: FROM debian:jessie +RUN set -ex; \ + if ! command -v gpg > /dev/null; then \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + gnupg2 \ + dirmngr \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + fi + # explicitly set user/group IDs RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile index 99b09d3c22..829974431d 100644 --- a/9.5/alpine/Dockerfile +++ b/9.5/alpine/Dockerfile @@ -56,6 +56,7 @@ RUN set -ex \ make \ # openldap-dev \ openssl-dev \ +# configure: error: prove not found perl \ # perl-dev \ # python-dev \ diff --git a/9.6/Dockerfile b/9.6/Dockerfile index 4d13096944..8fbf3dd686 100644 --- a/9.6/Dockerfile +++ b/9.6/Dockerfile @@ -1,6 +1,16 @@ # vim:set ft=dockerfile: FROM debian:jessie +RUN set -ex; \ + if ! command -v gpg > /dev/null; then \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + gnupg2 \ + dirmngr \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + fi + # explicitly set user/group IDs RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index 8c998c110e..0d335f6ecb 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -56,6 +56,7 @@ RUN set -ex \ make \ # openldap-dev \ openssl-dev \ +# configure: error: prove not found perl \ # perl-dev \ # python-dev \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index a49478bed0..2ec5be55e8 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -57,6 +57,7 @@ RUN set -ex \ make \ # openldap-dev \ openssl-dev \ +# configure: error: prove not found perl \ # perl-dev \ # python-dev \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index e0250ed523..55d05db7e1 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,6 +1,16 @@ # vim:set ft=dockerfile: FROM debian:%%DEBIAN_SUITE%% +RUN set -ex; \ + if ! command -v gpg > /dev/null; then \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + gnupg2 \ + dirmngr \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + fi + # explicitly set user/group IDs RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres diff --git a/update.sh b/update.sh index d8f83843fd..6aee7991ea 100755 --- a/update.sh +++ b/update.sh @@ -68,6 +68,11 @@ for version in "${versions[@]}"; do -e 's/%%PG_SHA256%%/'"$srcSha256"'/g' \ -e 's/%%ALPINE-VERSION%%/'"${alpineVersion[$version]}"'/g' \ "Dockerfile-$variant.template" > "$version/$variant/Dockerfile" + if [ "${alpineVersion[$version]}" != '3.5' ]; then + # prove was moved out of the perl package and into perl-utils in 3.6 + # https://pkgs.alpinelinux.org/contents?file=prove&path=&name=&branch=&repo=&arch=x86_64 + sed -ri 's/(\s+perl)(\s+)/\1-utils\2/' "$version/$variant/Dockerfile" + fi # TODO remove all this when 9.2 and 9.3 are EOL (2017-10-01 and 2018-10-01 -- from http://www.postgresql.org/support/versioning/) case "$version" in