diff --git a/postgres-appliance/Dockerfile b/postgres-appliance/Dockerfile index 73115847..94add7ff 100644 --- a/postgres-appliance/Dockerfile +++ b/postgres-appliance/Dockerfile @@ -53,14 +53,12 @@ ARG DEB_PG_SUPPORTED_VERSIONS="$PGOLDVERSIONS $PGVERSION" # Install PostgreSQL, extensions and contribs ENV POSTGIS_VERSION=3.6 \ - BG_MON_COMMIT=7f5887218790b263fe3f42f85f4ddc9c8400b154 \ + BG_MON_COMMIT=a73c6bcd10dfdf9feaf5eabab7eb6b12d167680d \ PG_AUTH_MON_COMMIT=fe099eef7662cbc85b0b79191f47f52f1e96b779 \ - PG_MON_COMMIT=ead1de70794ed62ca1e34d4022f6165ff36e9a91 \ - SET_USER=REL4_1_0 \ + PG_MON_COMMIT=88ac7b58348aa061c814982defc170644f368f39 \ PLPROFILER=REL4_2_5 \ - PG_PROFILE=4.10 \ - PAM_OAUTH2=v1.0.1 \ - PG_PERMISSIONS_COMMIT=f4b7c18676fa64236a1c8e28d34a35764e4a70e2 + PG_PROFILE=4.11 \ + PAM_OAUTH2=v1.0.1 WORKDIR /builddeps RUN bash base.sh diff --git a/postgres-appliance/build_scripts/base.sh b/postgres-appliance/build_scripts/base.sh index 19759b39..fd54a3e3 100644 --- a/postgres-appliance/build_scripts/base.sh +++ b/postgres-appliance/build_scripts/base.sh @@ -53,9 +53,7 @@ fi curl -sL "https://github.com/zalando-pg/bg_mon/archive/$BG_MON_COMMIT.tar.gz" | tar xz curl -sL "https://github.com/zalando-pg/pg_auth_mon/archive/$PG_AUTH_MON_COMMIT.tar.gz" | tar xz -curl -sL "https://github.com/cybertec-postgresql/pg_permissions/archive/$PG_PERMISSIONS_COMMIT.tar.gz" | tar xz curl -sL "https://github.com/zubkov-andrei/pg_profile/archive/$PG_PROFILE.tar.gz" | tar xz -git clone -b "$SET_USER" https://github.com/pgaudit/set_user.git apt-get install -y \ postgresql-common \ @@ -124,6 +122,8 @@ for version in $DEB_PG_SUPPORTED_VERSIONS; do "postgresql-server-dev-${version}" \ "postgresql-${version}-pgq3" \ "postgresql-${version}-pg-stat-kcache" \ + "postgresql-${version}-pg-permissions" \ + "postgresql-${version}-set-user" \ "${EXTRAS[@]}" # Clean up timescaledb versions - keep at least 5 minor versions, but ensure compatibility with the lowest/oldest PG version (where possible) @@ -183,8 +183,6 @@ for version in $DEB_PG_SUPPORTED_VERSIONS; do for n in bg_mon-${BG_MON_COMMIT} \ pg_auth_mon-${PG_AUTH_MON_COMMIT} \ - set_user \ - pg_permissions-${PG_PERMISSIONS_COMMIT} \ pg_profile-${PG_PROFILE} \ "${EXTRA_EXTENSIONS[@]}"; do PATH="/usr/lib/postgresql/$version/bin:$PATH" make -C "$n" USE_PGXS=1 clean