diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index a5ec816325..10b736dd69 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -45,23 +45,22 @@ RUN set -eux; \ dpkg-dev dpkg \ flex \ gcc \ -# krb5-dev \ + krb5-dev \ libc-dev \ libedit-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ -# openldap-dev \ + openldap-dev \ openssl-dev \ # configure: error: prove not found perl-utils \ # configure: error: Perl module IPC::Run is required to run TAP tests perl-ipc-run \ -# perl-dev \ -# python-dev \ -# python3-dev \ -# tcl-dev \ + perl-dev \ + python3-dev \ + tcl-dev \ util-linux-dev \ zlib-dev \ # 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 \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - \ -# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) -# --with-krb5 \ -# --with-gssapi \ -# --with-ldap \ -# --with-tcl \ -# --with-perl \ -# --with-python \ + --with-krb5 \ + --with-gssapi \ + --with-ldap \ + --with-tcl \ + --with-perl \ + --with-python \ # --with-pam \ --with-openssl \ --with-libxml \ @@ -120,6 +117,9 @@ RUN set -eux; \ | tr ',' '\n' \ | sort -u \ | 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 \ $runDeps \ diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 37181f68fc..750e665767 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ dpkg-dev dpkg \ flex \ gcc \ -# krb5-dev \ + krb5-dev \ libc-dev \ libedit-dev \ libxml2-dev \ @@ -53,16 +53,15 @@ RUN set -eux; \ linux-headers \ llvm11-dev clang g++ \ make \ -# openldap-dev \ + openldap-dev \ openssl-dev \ # configure: error: prove not found perl-utils \ # configure: error: Perl module IPC::Run is required to run TAP tests perl-ipc-run \ -# perl-dev \ -# python-dev \ -# python3-dev \ -# tcl-dev \ + perl-dev \ + python3-dev \ + tcl-dev \ util-linux-dev \ zlib-dev \ # 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 \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - \ -# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) -# --with-krb5 \ -# --with-gssapi \ -# --with-ldap \ -# --with-tcl \ -# --with-perl \ -# --with-python \ + --with-krb5 \ + --with-gssapi \ + --with-ldap \ + --with-tcl \ + --with-perl \ + --with-python \ # --with-pam \ --with-openssl \ --with-libxml \ @@ -122,6 +119,9 @@ RUN set -eux; \ | tr ',' '\n' \ | sort -u \ | 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 \ $runDeps \ diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 15328ae33a..6a5dfd6f2a 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ dpkg-dev dpkg \ flex \ gcc \ -# krb5-dev \ + krb5-dev \ libc-dev \ libedit-dev \ libxml2-dev \ @@ -53,16 +53,15 @@ RUN set -eux; \ linux-headers \ llvm11-dev clang g++ \ make \ -# openldap-dev \ + openldap-dev \ openssl-dev \ # configure: error: prove not found perl-utils \ # configure: error: Perl module IPC::Run is required to run TAP tests perl-ipc-run \ -# perl-dev \ -# python-dev \ -# python3-dev \ -# tcl-dev \ + perl-dev \ + python3-dev \ + tcl-dev \ util-linux-dev \ zlib-dev \ # 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 \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - \ -# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) -# --with-krb5 \ -# --with-gssapi \ -# --with-ldap \ -# --with-tcl \ -# --with-perl \ -# --with-python \ + --with-krb5 \ + --with-gssapi \ + --with-ldap \ + --with-tcl \ + --with-perl \ + --with-python \ # --with-pam \ --with-openssl \ --with-libxml \ @@ -122,6 +119,9 @@ RUN set -eux; \ | tr ',' '\n' \ | sort -u \ | 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 \ $runDeps \ diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile index 12fa8355ab..7fc80cc9b5 100644 --- a/13/alpine/Dockerfile +++ b/13/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ dpkg-dev dpkg \ flex \ gcc \ -# krb5-dev \ + krb5-dev \ libc-dev \ libedit-dev \ libxml2-dev \ @@ -53,16 +53,15 @@ RUN set -eux; \ linux-headers \ llvm11-dev clang g++ \ make \ -# openldap-dev \ + openldap-dev \ openssl-dev \ # configure: error: prove not found perl-utils \ # configure: error: Perl module IPC::Run is required to run TAP tests perl-ipc-run \ -# perl-dev \ -# python-dev \ -# python3-dev \ -# tcl-dev \ + perl-dev \ + python3-dev \ + tcl-dev \ util-linux-dev \ zlib-dev \ # 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 \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - \ -# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) -# --with-krb5 \ -# --with-gssapi \ -# --with-ldap \ -# --with-tcl \ -# --with-perl \ -# --with-python \ + --with-krb5 \ + --with-gssapi \ + --with-ldap \ + --with-tcl \ + --with-perl \ + --with-python \ # --with-pam \ --with-openssl \ --with-libxml \ @@ -122,6 +119,9 @@ RUN set -eux; \ | tr ',' '\n' \ | sort -u \ | 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 \ $runDeps \ diff --git a/14/alpine/Dockerfile b/14/alpine/Dockerfile index b8e387fa64..d03d5d42ba 100644 --- a/14/alpine/Dockerfile +++ b/14/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ dpkg-dev dpkg \ flex \ gcc \ -# krb5-dev \ + krb5-dev \ libc-dev \ libedit-dev \ libxml2-dev \ @@ -53,16 +53,15 @@ RUN set -eux; \ linux-headers \ llvm11-dev clang g++ \ make \ -# openldap-dev \ + openldap-dev \ openssl-dev \ # configure: error: prove not found perl-utils \ # configure: error: Perl module IPC::Run is required to run TAP tests perl-ipc-run \ -# perl-dev \ -# python-dev \ -# python3-dev \ -# tcl-dev \ + perl-dev \ + python3-dev \ + tcl-dev \ util-linux-dev \ zlib-dev \ # 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 \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - \ -# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) -# --with-krb5 \ -# --with-gssapi \ -# --with-ldap \ -# --with-tcl \ -# --with-perl \ -# --with-python \ + --with-krb5 \ + --with-gssapi \ + --with-ldap \ + --with-tcl \ + --with-perl \ + --with-python \ # --with-pam \ --with-openssl \ --with-libxml \ @@ -125,6 +122,9 @@ RUN set -eux; \ | tr ',' '\n' \ | sort -u \ | 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 \ $runDeps \ diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index 6b843d5e34..dc391b7fc2 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -45,23 +45,22 @@ RUN set -eux; \ dpkg-dev dpkg \ flex \ gcc \ -# krb5-dev \ + krb5-dev \ libc-dev \ libedit-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ -# openldap-dev \ + openldap-dev \ openssl-dev \ # configure: error: prove not found perl-utils \ # configure: error: Perl module IPC::Run is required to run TAP tests perl-ipc-run \ -# perl-dev \ -# python-dev \ -# python3-dev \ -# tcl-dev \ + perl-dev \ + python3-dev \ + tcl-dev \ util-linux-dev \ zlib-dev \ ; \ @@ -95,14 +94,12 @@ RUN set -eux; \ --prefix=/usr/local \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - \ -# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) -# --with-krb5 \ -# --with-gssapi \ -# --with-ldap \ -# --with-tcl \ -# --with-perl \ -# --with-python \ + --with-krb5 \ + --with-gssapi \ + --with-ldap \ + --with-tcl \ + --with-perl \ + --with-python \ # --with-pam \ --with-openssl \ --with-libxml \ @@ -117,6 +114,9 @@ RUN set -eux; \ | tr ',' '\n' \ | sort -u \ | 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 \ $runDeps \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 9979f973dc..31a9882e50 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -39,7 +39,7 @@ RUN set -eux; \ dpkg-dev dpkg \ flex \ gcc \ -# krb5-dev \ + krb5-dev \ libc-dev \ libedit-dev \ libxml2-dev \ @@ -49,16 +49,15 @@ RUN set -eux; \ llvm11-dev clang g++ \ {{ ) else "" end -}} make \ -# openldap-dev \ + openldap-dev \ openssl-dev \ # configure: error: prove not found perl-utils \ # configure: error: Perl module IPC::Run is required to run TAP tests perl-ipc-run \ -# perl-dev \ -# python-dev \ -# python3-dev \ -# tcl-dev \ + perl-dev \ + python3-dev \ + tcl-dev \ util-linux-dev \ zlib-dev \ {{ if .major >= 10 then ( -}} @@ -100,14 +99,12 @@ RUN set -eux; \ --prefix=/usr/local \ --with-includes=/usr/local/include \ --with-libraries=/usr/local/lib \ - \ -# these make our image abnormally large (at least 100MB larger), which seems uncouth for an "Alpine" (ie, "small") variant :) -# --with-krb5 \ -# --with-gssapi \ -# --with-ldap \ -# --with-tcl \ -# --with-perl \ -# --with-python \ + --with-krb5 \ + --with-gssapi \ + --with-ldap \ + --with-tcl \ + --with-perl \ + --with-python \ # --with-pam \ --with-openssl \ --with-libxml \ @@ -131,6 +128,9 @@ RUN set -eux; \ | tr ',' '\n' \ | sort -u \ | 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 \ $runDeps \