You've already forked postgres
mirror of
https://github.com/docker-library/postgres.git
synced 2025-07-29 21:41:20 +03:00
Add gpg when necessary, ensure prove
exists
This commit is contained in:
@ -1,6 +1,16 @@
|
|||||||
# vim:set ft=dockerfile:
|
# vim:set ft=dockerfile:
|
||||||
FROM debian:stretch
|
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
|
# explicitly set user/group IDs
|
||||||
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
||||||
|
|
||||||
|
@ -56,7 +56,8 @@ RUN set -ex \
|
|||||||
make \
|
make \
|
||||||
# openldap-dev \
|
# openldap-dev \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
perl \
|
# configure: error: prove not found
|
||||||
|
perl-utils \
|
||||||
# perl-dev \
|
# perl-dev \
|
||||||
# python-dev \
|
# python-dev \
|
||||||
# python3-dev \
|
# python3-dev \
|
||||||
|
@ -1,6 +1,16 @@
|
|||||||
# vim:set ft=dockerfile:
|
# vim:set ft=dockerfile:
|
||||||
FROM debian:jessie
|
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
|
# explicitly set user/group IDs
|
||||||
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
||||||
|
|
||||||
|
@ -59,6 +59,7 @@ RUN set -ex \
|
|||||||
make \
|
make \
|
||||||
# openldap-dev \
|
# openldap-dev \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
|
# configure: error: prove not found
|
||||||
perl \
|
perl \
|
||||||
# perl-dev \
|
# perl-dev \
|
||||||
# python-dev \
|
# python-dev \
|
||||||
|
@ -1,6 +1,16 @@
|
|||||||
# vim:set ft=dockerfile:
|
# vim:set ft=dockerfile:
|
||||||
FROM debian:jessie
|
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
|
# explicitly set user/group IDs
|
||||||
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
||||||
|
|
||||||
|
@ -59,6 +59,7 @@ RUN set -ex \
|
|||||||
make \
|
make \
|
||||||
# openldap-dev \
|
# openldap-dev \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
|
# configure: error: prove not found
|
||||||
perl \
|
perl \
|
||||||
# perl-dev \
|
# perl-dev \
|
||||||
# python-dev \
|
# python-dev \
|
||||||
|
@ -1,6 +1,16 @@
|
|||||||
# vim:set ft=dockerfile:
|
# vim:set ft=dockerfile:
|
||||||
FROM debian:jessie
|
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
|
# explicitly set user/group IDs
|
||||||
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
||||||
|
|
||||||
|
@ -56,6 +56,7 @@ RUN set -ex \
|
|||||||
make \
|
make \
|
||||||
# openldap-dev \
|
# openldap-dev \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
|
# configure: error: prove not found
|
||||||
perl \
|
perl \
|
||||||
# perl-dev \
|
# perl-dev \
|
||||||
# python-dev \
|
# python-dev \
|
||||||
|
@ -1,6 +1,16 @@
|
|||||||
# vim:set ft=dockerfile:
|
# vim:set ft=dockerfile:
|
||||||
FROM debian:jessie
|
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
|
# explicitly set user/group IDs
|
||||||
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
||||||
|
|
||||||
|
@ -56,6 +56,7 @@ RUN set -ex \
|
|||||||
make \
|
make \
|
||||||
# openldap-dev \
|
# openldap-dev \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
|
# configure: error: prove not found
|
||||||
perl \
|
perl \
|
||||||
# perl-dev \
|
# perl-dev \
|
||||||
# python-dev \
|
# python-dev \
|
||||||
|
@ -1,6 +1,16 @@
|
|||||||
# vim:set ft=dockerfile:
|
# vim:set ft=dockerfile:
|
||||||
FROM debian:jessie
|
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
|
# explicitly set user/group IDs
|
||||||
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
||||||
|
|
||||||
|
@ -56,6 +56,7 @@ RUN set -ex \
|
|||||||
make \
|
make \
|
||||||
# openldap-dev \
|
# openldap-dev \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
|
# configure: error: prove not found
|
||||||
perl \
|
perl \
|
||||||
# perl-dev \
|
# perl-dev \
|
||||||
# python-dev \
|
# python-dev \
|
||||||
|
@ -57,6 +57,7 @@ RUN set -ex \
|
|||||||
make \
|
make \
|
||||||
# openldap-dev \
|
# openldap-dev \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
|
# configure: error: prove not found
|
||||||
perl \
|
perl \
|
||||||
# perl-dev \
|
# perl-dev \
|
||||||
# python-dev \
|
# python-dev \
|
||||||
|
@ -1,6 +1,16 @@
|
|||||||
# vim:set ft=dockerfile:
|
# vim:set ft=dockerfile:
|
||||||
FROM debian:%%DEBIAN_SUITE%%
|
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
|
# explicitly set user/group IDs
|
||||||
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
|
||||||
|
|
||||||
|
@ -68,6 +68,11 @@ for version in "${versions[@]}"; do
|
|||||||
-e 's/%%PG_SHA256%%/'"$srcSha256"'/g' \
|
-e 's/%%PG_SHA256%%/'"$srcSha256"'/g' \
|
||||||
-e 's/%%ALPINE-VERSION%%/'"${alpineVersion[$version]}"'/g' \
|
-e 's/%%ALPINE-VERSION%%/'"${alpineVersion[$version]}"'/g' \
|
||||||
"Dockerfile-$variant.template" > "$version/$variant/Dockerfile"
|
"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/)
|
# 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
|
case "$version" in
|
||||||
|
Reference in New Issue
Block a user