docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-07-28 10:42:06 +03:00
Code Activity

Merge pull request #906 from wolfgangwalther/alpine/add-missing-contrib

Browse Source 
Add missing contrib modules / pl extensions to alpine image
This commit is contained in:
yosifkit
2021-11-15 09:35:43 -08:00
committed by GitHub
parent a11e908fb5 e331a5bb8d
commit bafaf65a23
7 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
10/alpine/Dockerfile generated
View File

@ -45,23 +45,22 @@ RUN set -eux; \
dpkg-dev dpkg \ dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ krb5-dev \
libc-dev \ libc-dev \
libedit-dev \ libedit-dev \
libxml2-dev \ libxml2-dev \
libxslt-dev \ libxslt-dev \
linux-headers \ linux-headers \
make \ make \
# openldap-dev \ openldap-dev \
openssl-dev \ openssl-dev \
# configure: error: prove not found # configure: error: prove not found
perl-utils \ perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests # configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \ perl-ipc-run \
# perl-dev \ perl-dev \
# python-dev \ python3-dev \
# python3-dev \ tcl-dev \
# tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
@ -97,14 +96,12 @@ RUN set -eux; \
--prefix=/usr/local \ --prefix=/usr/local \
--with-includes=/usr/local/include \ --with-includes=/usr/local/include \
--with-libraries=/usr/local/lib \ --with-libraries=/usr/local/lib \
\ --with-krb5 \
# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) --with-gssapi \
# --with-krb5 \ --with-ldap \
# --with-gssapi \ --with-tcl \
# --with-ldap \ --with-perl \
# --with-tcl \ --with-python \
# --with-perl \
# --with-python \
# --with-pam \ # --with-pam \
--with-openssl \ --with-openssl \
--with-libxml \ --with-libxml \
@ -120,6 +117,9 @@ RUN set -eux; \
| tr ',' '\n' \ | tr ',' '\n' \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
# Remove plperl, plpython and pltcl dependencies by default to save image size
# To use the pl extensions, those have to be installed in a derived image
| grep -v -e perl -e python -e tcl \
)"; \ )"; \
apk add --no-cache --virtual .postgresql-rundeps \ apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

28
11/alpine/Dockerfile generated
View File

@ -45,7 +45,7 @@ RUN set -eux; \
dpkg-dev dpkg \ dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ krb5-dev \
libc-dev \ libc-dev \
libedit-dev \ libedit-dev \
libxml2-dev \ libxml2-dev \
@ -53,16 +53,15 @@ RUN set -eux; \
linux-headers \ linux-headers \
llvm11-dev clang g++ \ llvm11-dev clang g++ \
make \ make \
# openldap-dev \ openldap-dev \
openssl-dev \ openssl-dev \
# configure: error: prove not found # configure: error: prove not found
perl-utils \ perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests # configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \ perl-ipc-run \
# perl-dev \ perl-dev \
# python-dev \ python3-dev \
# python3-dev \ tcl-dev \
# tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
@ -98,14 +97,12 @@ RUN set -eux; \
--prefix=/usr/local \ --prefix=/usr/local \
--with-includes=/usr/local/include \ --with-includes=/usr/local/include \
--with-libraries=/usr/local/lib \ --with-libraries=/usr/local/lib \
\ --with-krb5 \
# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) --with-gssapi \
# --with-krb5 \ --with-ldap \
# --with-gssapi \ --with-tcl \
# --with-ldap \ --with-perl \
# --with-tcl \ --with-python \
# --with-perl \
# --with-python \
# --with-pam \ # --with-pam \
--with-openssl \ --with-openssl \
--with-libxml \ --with-libxml \
@ -122,6 +119,9 @@ RUN set -eux; \
| tr ',' '\n' \ | tr ',' '\n' \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
# Remove plperl, plpython and pltcl dependencies by default to save image size
# To use the pl extensions, those have to be installed in a derived image
| grep -v -e perl -e python -e tcl \
)"; \ )"; \
apk add --no-cache --virtual .postgresql-rundeps \ apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

28
12/alpine/Dockerfile generated
View File

@ -45,7 +45,7 @@ RUN set -eux; \
dpkg-dev dpkg \ dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ krb5-dev \
libc-dev \ libc-dev \
libedit-dev \ libedit-dev \
libxml2-dev \ libxml2-dev \
@ -53,16 +53,15 @@ RUN set -eux; \
linux-headers \ linux-headers \
llvm11-dev clang g++ \ llvm11-dev clang g++ \
make \ make \
# openldap-dev \ openldap-dev \
openssl-dev \ openssl-dev \
# configure: error: prove not found # configure: error: prove not found
perl-utils \ perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests # configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \ perl-ipc-run \
# perl-dev \ perl-dev \
# python-dev \ python3-dev \
# python3-dev \ tcl-dev \
# tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
@ -98,14 +97,12 @@ RUN set -eux; \
--prefix=/usr/local \ --prefix=/usr/local \
--with-includes=/usr/local/include \ --with-includes=/usr/local/include \
--with-libraries=/usr/local/lib \ --with-libraries=/usr/local/lib \
\ --with-krb5 \
# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) --with-gssapi \
# --with-krb5 \ --with-ldap \
# --with-gssapi \ --with-tcl \
# --with-ldap \ --with-perl \
# --with-tcl \ --with-python \
# --with-perl \
# --with-python \
# --with-pam \ # --with-pam \
--with-openssl \ --with-openssl \
--with-libxml \ --with-libxml \
@ -122,6 +119,9 @@ RUN set -eux; \
| tr ',' '\n' \ | tr ',' '\n' \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
# Remove plperl, plpython and pltcl dependencies by default to save image size
# To use the pl extensions, those have to be installed in a derived image
| grep -v -e perl -e python -e tcl \
)"; \ )"; \
apk add --no-cache --virtual .postgresql-rundeps \ apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

28
13/alpine/Dockerfile generated
View File

@ -45,7 +45,7 @@ RUN set -eux; \
dpkg-dev dpkg \ dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ krb5-dev \
libc-dev \ libc-dev \
libedit-dev \ libedit-dev \
libxml2-dev \ libxml2-dev \
@ -53,16 +53,15 @@ RUN set -eux; \
linux-headers \ linux-headers \
llvm11-dev clang g++ \ llvm11-dev clang g++ \
make \ make \
# openldap-dev \ openldap-dev \
openssl-dev \ openssl-dev \
# configure: error: prove not found # configure: error: prove not found
perl-utils \ perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests # configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \ perl-ipc-run \
# perl-dev \ perl-dev \
# python-dev \ python3-dev \
# python3-dev \ tcl-dev \
# tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
@ -98,14 +97,12 @@ RUN set -eux; \
--prefix=/usr/local \ --prefix=/usr/local \
--with-includes=/usr/local/include \ --with-includes=/usr/local/include \
--with-libraries=/usr/local/lib \ --with-libraries=/usr/local/lib \
\ --with-krb5 \
# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) --with-gssapi \
# --with-krb5 \ --with-ldap \
# --with-gssapi \ --with-tcl \
# --with-ldap \ --with-perl \
# --with-tcl \ --with-python \
# --with-perl \
# --with-python \
# --with-pam \ # --with-pam \
--with-openssl \ --with-openssl \
--with-libxml \ --with-libxml \
@ -122,6 +119,9 @@ RUN set -eux; \
| tr ',' '\n' \ | tr ',' '\n' \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
# Remove plperl, plpython and pltcl dependencies by default to save image size
# To use the pl extensions, those have to be installed in a derived image
| grep -v -e perl -e python -e tcl \
)"; \ )"; \
apk add --no-cache --virtual .postgresql-rundeps \ apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

28
14/alpine/Dockerfile generated
View File

@ -45,7 +45,7 @@ RUN set -eux; \
dpkg-dev dpkg \ dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ krb5-dev \
libc-dev \ libc-dev \
libedit-dev \ libedit-dev \
libxml2-dev \ libxml2-dev \
@ -53,16 +53,15 @@ RUN set -eux; \
linux-headers \ linux-headers \
llvm11-dev clang g++ \ llvm11-dev clang g++ \
make \ make \
# openldap-dev \ openldap-dev \
openssl-dev \ openssl-dev \
# configure: error: prove not found # configure: error: prove not found
perl-utils \ perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests # configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \ perl-ipc-run \
# perl-dev \ perl-dev \
# python-dev \ python3-dev \
# python3-dev \ tcl-dev \
# tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13 # https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
@ -100,14 +99,12 @@ RUN set -eux; \
--prefix=/usr/local \ --prefix=/usr/local \
--with-includes=/usr/local/include \ --with-includes=/usr/local/include \
--with-libraries=/usr/local/lib \ --with-libraries=/usr/local/lib \
\ --with-krb5 \
# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) --with-gssapi \
# --with-krb5 \ --with-ldap \
# --with-gssapi \ --with-tcl \
# --with-ldap \ --with-perl \
# --with-tcl \ --with-python \
# --with-perl \
# --with-python \
# --with-pam \ # --with-pam \
--with-openssl \ --with-openssl \
--with-libxml \ --with-libxml \
@ -125,6 +122,9 @@ RUN set -eux; \
| tr ',' '\n' \ | tr ',' '\n' \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
# Remove plperl, plpython and pltcl dependencies by default to save image size
# To use the pl extensions, those have to be installed in a derived image
| grep -v -e perl -e python -e tcl \
)"; \ )"; \
apk add --no-cache --virtual .postgresql-rundeps \ apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

28
9.6/alpine/Dockerfile generated
View File

@ -45,23 +45,22 @@ RUN set -eux; \
dpkg-dev dpkg \ dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ krb5-dev \
libc-dev \ libc-dev \
libedit-dev \ libedit-dev \
libxml2-dev \ libxml2-dev \
libxslt-dev \ libxslt-dev \
linux-headers \ linux-headers \
make \ make \
# openldap-dev \ openldap-dev \
openssl-dev \ openssl-dev \
# configure: error: prove not found # configure: error: prove not found
perl-utils \ perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests # configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \ perl-ipc-run \
# perl-dev \ perl-dev \
# python-dev \ python3-dev \
# python3-dev \ tcl-dev \
# tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
; \ ; \
@ -95,14 +94,12 @@ RUN set -eux; \
--prefix=/usr/local \ --prefix=/usr/local \
--with-includes=/usr/local/include \ --with-includes=/usr/local/include \
--with-libraries=/usr/local/lib \ --with-libraries=/usr/local/lib \
\ --with-krb5 \
# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) --with-gssapi \
# --with-krb5 \ --with-ldap \
# --with-gssapi \ --with-tcl \
# --with-ldap \ --with-perl \
# --with-tcl \ --with-python \
# --with-perl \
# --with-python \
# --with-pam \ # --with-pam \
--with-openssl \ --with-openssl \
--with-libxml \ --with-libxml \
@ -117,6 +114,9 @@ RUN set -eux; \
| tr ',' '\n' \ | tr ',' '\n' \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
# Remove plperl, plpython and pltcl dependencies by default to save image size
# To use the pl extensions, those have to be installed in a derived image
| grep -v -e perl -e python -e tcl \
)"; \ )"; \
apk add --no-cache --virtual .postgresql-rundeps \ apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \

28
Dockerfile-alpine.template
View File

@ -39,7 +39,7 @@ RUN set -eux; \
dpkg-dev dpkg \ dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ krb5-dev \
libc-dev \ libc-dev \
libedit-dev \ libedit-dev \
libxml2-dev \ libxml2-dev \
@ -49,16 +49,15 @@ RUN set -eux; \
llvm11-dev clang g++ \ llvm11-dev clang g++ \
{{ ) else "" end -}} {{ ) else "" end -}}
make \ make \
# openldap-dev \ openldap-dev \
openssl-dev \ openssl-dev \
# configure: error: prove not found # configure: error: prove not found
perl-utils \ perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests # configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \ perl-ipc-run \
# perl-dev \ perl-dev \
# python-dev \ python3-dev \
# python3-dev \ tcl-dev \
# tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
{{ if .major >= 10 then ( -}} {{ if .major >= 10 then ( -}}
@ -100,14 +99,12 @@ RUN set -eux; \
--prefix=/usr/local \ --prefix=/usr/local \
--with-includes=/usr/local/include \ --with-includes=/usr/local/include \
--with-libraries=/usr/local/lib \ --with-libraries=/usr/local/lib \
\ --with-krb5 \
# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) --with-gssapi \
# --with-krb5 \ --with-ldap \
# --with-gssapi \ --with-tcl \
# --with-ldap \ --with-perl \
# --with-tcl \ --with-python \
# --with-perl \
# --with-python \
# --with-pam \ # --with-pam \
--with-openssl \ --with-openssl \
--with-libxml \ --with-libxml \
@ -131,6 +128,9 @@ RUN set -eux; \
| tr ',' '\n' \ | tr ',' '\n' \
| sort -u \ | sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
# Remove plperl, plpython and pltcl dependencies by default to save image size
# To use the pl extensions, those have to be installed in a derived image
| grep -v -e perl -e python -e tcl \
)"; \ )"; \
apk add --no-cache --virtual .postgresql-rundeps \ apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \ $runDeps \