diff --git a/Dockerfile-u18 b/Dockerfile-u18 index 12431b724..97ad5278e 100644 --- a/Dockerfile-u18 +++ b/Dockerfile-u18 @@ -32,7 +32,6 @@ ARG postgresql_release=${postgresql_major}.1 # ARG pgroonga_release=2.4.0 # ARG wrappers_release=0.1.16 # ARG hypopg_release=1.3.1 -# ARG pg_repack_release=1.4.8 # ARG pgvector_release=0.4.0 # ARG pg_tle_release=1.0.3 # ARG supautils_release=1.9.0 @@ -113,8 +112,6 @@ ARG pgroonga_release_checksum=sha256:885ff3878cc30e9030e5fc56d561bc8b66df3ede156 ARG wrappers_release=0.1.16 ARG hypopg_release=1.3.1 ARG hypopg_release_checksum=sha256:e7f01ee0259dc1713f318a108f987663d60f3041948c2ada57a94b469565ca8e -ARG pg_repack_release=1.4.8 -ARG pg_repack_release_checksum=sha256:18b4d871c1abf78cf0b1b1fe6081d435d183a8dc5eb977576e7a47fe113dd4ec ARG pgvector_release=0.5.0 ARG pgvector_release_checksum=sha256:d8aa3504b215467ca528525a6de12c3f85f9891b091ce0e5864dd8a9b757f77b ARG pg_tle_release=1.0.4 @@ -800,32 +797,6 @@ RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccac # Create debian package RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --nodoc -#################### -# 27-pg_repack.yml -#################### -FROM ccache as pg_repack-source -ARG pg_repack_release -ARG pg_repack_release_checksum -ADD --checksum=${pg_repack_release_checksum} \ - "https://github.com/reorg/pg_repack/archive/refs/tags/ver_${pg_repack_release}.tar.gz" \ - /tmp/pg_repack.tar.gz -RUN tar -xvf /tmp/pg_repack.tar.gz -C /tmp && \ - rm -rf /tmp/pg_repack.tar.gz -# Install build dependencies -RUN apt-get update && apt-get install -y --no-install-recommends \ - liblz4-dev \ - libz-dev \ - libzstd-dev \ - libreadline-dev \ - && rm -rf /var/lib/apt/lists/* -# Build from source -WORKDIR /tmp/pg_repack-ver_${pg_repack_release} -ENV USE_PGXS=1 -RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccache \ - make -j$(nproc) -# Create debian package -RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --pkgversion=${pg_repack_release} --nodoc - #################### # 28-pgvector.yml #################### @@ -902,7 +873,6 @@ COPY --from=vault-source /tmp/*.deb /tmp/ COPY --from=pgroonga-source /tmp/*.deb /tmp/ COPY --from=wrappers /tmp/*.deb /tmp/ COPY --from=hypopg-source /tmp/*.deb /tmp/ -COPY --from=pg_repack-source /tmp/*.deb /tmp/ COPY --from=pgvector-source /tmp/*.deb /tmp/ COPY --from=pg_tle-source /tmp/*.deb /tmp/ COPY --from=supautils /tmp/*.deb /tmp/ @@ -1037,4 +1007,4 @@ COPY --from=pg_binary_collection_base /usr/share/postgresql/${postgresql_major} RUN cd /tmp/pg_binaries && \ tar czvf 18.04.tar.gz ${postgresql_major}/ && \ rm -rf ${postgresql_major}/ - \ No newline at end of file + diff --git a/ansible/files/postgresql_config/supautils.conf.j2 b/ansible/files/postgresql_config/supautils.conf.j2 index b5305a66e..39795982c 100644 --- a/ansible/files/postgresql_config/supautils.conf.j2 +++ b/ansible/files/postgresql_config/supautils.conf.j2 @@ -1,9 +1,9 @@ supautils.placeholders = 'response.headers' supautils.placeholders_disallowed_values = '"content-type"' -# full list: address_standardizer, address_standardizer_data_us, adminpack, amcheck, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, file_fdw, fuzzystrmatch, hstore, http, hypopg, insert_username, intagg, intarray, isn, lo, ltree, moddatetime, old_snapshot, pageinspect, pg_buffercache, pg_cron, pg_freespacemap, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_prewarm, pg_repack, pg_stat_monitor, pg_stat_statements, pg_surgery, pg_tle, pg_trgm, pg_visibility, pg_walinspect, pgaudit, pgcrypto, pgjwt, pgroonga, pgroonga_database, pgrouting, pgrowlocks, pgsodium, pgstattuple, pgtap, plcoffee, pljava, plls, plpgsql, plpgsql_check, plv8, postgis, postgis_raster, postgis_sfcgal, postgis_tiger_geocoder, postgis_topology, postgres_fdw, refint, rum, seg, sslinfo, supabase_vault, supautils, tablefunc, tcn, timescaledb, tsm_system_rows, tsm_system_time, unaccent, uuid-ossp, vector, wrappers, xml2 +# full list: address_standardizer, address_standardizer_data_us, adminpack, amcheck, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, file_fdw, fuzzystrmatch, hstore, http, hypopg, insert_username, intagg, intarray, isn, lo, ltree, moddatetime, old_snapshot, pageinspect, pg_buffercache, pg_cron, pg_freespacemap, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_prewarm, pg_stat_monitor, pg_stat_statements, pg_surgery, pg_tle, pg_trgm, pg_visibility, pg_walinspect, pgaudit, pgcrypto, pgjwt, pgroonga, pgroonga_database, pgrouting, pgrowlocks, pgsodium, pgstattuple, pgtap, plcoffee, pljava, plls, plpgsql, plpgsql_check, plv8, postgis, postgis_raster, postgis_sfcgal, postgis_tiger_geocoder, postgis_topology, postgres_fdw, refint, rum, seg, sslinfo, supabase_vault, supautils, tablefunc, tcn, timescaledb, tsm_system_rows, tsm_system_time, unaccent, uuid-ossp, vector, wrappers, xml2 # omitted because may be unsafe: adminpack, amcheck, file_fdw, lo, old_snapshot, pageinspect, pg_buffercache, pg_freespacemap, pg_prewarm, pg_surgery, pg_visibility, pgstattuple # omitted because deprecated: intagg, xml2 -supautils.privileged_extensions = 'address_standardizer, address_standardizer_data_us, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, fuzzystrmatch, hstore, http, hypopg, insert_username, intarray, isn, ltree, moddatetime, pg_cron, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_repack, pg_stat_monitor, pg_stat_statements, pg_tle, pg_trgm, pg_walinspect, pgaudit, pgcrypto, pgjwt, pgroonga, pgroonga_database, pgrouting, pgrowlocks, pgsodium, pgtap, plcoffee, pljava, plls, plpgsql, plpgsql_check, plv8, postgis, postgis_raster, postgis_sfcgal, postgis_tiger_geocoder, postgis_topology, postgres_fdw, refint, rum, seg, sslinfo, supabase_vault, supautils, tablefunc, tcn, timescaledb, tsm_system_rows, tsm_system_time, unaccent, uuid-ossp, vector, wrappers' +supautils.privileged_extensions = 'address_standardizer, address_standardizer_data_us, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, fuzzystrmatch, hstore, http, hypopg, insert_username, intarray, isn, ltree, moddatetime, pg_cron, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_stat_monitor, pg_stat_statements, pg_tle, pg_trgm, pg_walinspect, pgaudit, pgcrypto, pgjwt, pgroonga, pgroonga_database, pgrouting, pgrowlocks, pgsodium, pgtap, plcoffee, pljava, plls, plpgsql, plpgsql_check, plv8, postgis, postgis_raster, postgis_sfcgal, postgis_tiger_geocoder, postgis_topology, postgres_fdw, refint, rum, seg, sslinfo, supabase_vault, supautils, tablefunc, tcn, timescaledb, tsm_system_rows, tsm_system_time, unaccent, uuid-ossp, vector, wrappers' supautils.privileged_extensions_custom_scripts_path = '/etc/postgresql-custom/extension-custom-scripts' supautils.privileged_extensions_superuser = 'supabase_admin' supautils.privileged_role = 'postgres' diff --git a/ansible/tasks/postgres-extensions/27-pg_repack.yml b/ansible/tasks/postgres-extensions/27-pg_repack.yml deleted file mode 100644 index 3a2aa96ef..000000000 --- a/ansible/tasks/postgres-extensions/27-pg_repack.yml +++ /dev/null @@ -1,37 +0,0 @@ -# pg_repack -- name: pg_repack - download & install dependencies - apt: - pkg: - - liblz4-dev - - libz-dev - - libzstd-dev - - libreadline-dev - update_cache: yes - install_recommends: no - -- name: pg_repack - download latest release - git: - repo: https://github.com/reorg/pg_repack.git - dest: /tmp/pg_repack - version: "ver_{{ pg_repack_release }}" - become: yes - -- name: pg_repack - build - make: - chdir: /tmp/pg_repack - params: - USE_PGXS: 1 - become: yes - -- name: pg_repack - install - make: - chdir: /tmp/pg_repack - target: install - params: - USE_PGXS: 1 - become: yes - -- name: pg_repack - cleanup - file: - state: absent - path: /tmp/pg_repack diff --git a/ansible/tasks/setup-extensions.yml b/ansible/tasks/setup-extensions.yml index 02502f410..e8d5990ed 100644 --- a/ansible/tasks/setup-extensions.yml +++ b/ansible/tasks/setup-extensions.yml @@ -80,9 +80,6 @@ - name: Install hypopg import_tasks: tasks/postgres-extensions/26-hypopg.yml -- name: Install pg_repack - import_tasks: tasks/postgres-extensions/27-pg_repack.yml - - name: Install pgvector import_tasks: tasks/postgres-extensions/28-pgvector.yml diff --git a/ansible/vars.yml b/ansible/vars.yml index 29fc6b1ce..cbdecdff4 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -126,9 +126,6 @@ wrappers_release: "0.1.16" hypopg_release: "1.3.1" hypopg_release_checksum: sha256:e7f01ee0259dc1713f318a108f987663d60f3041948c2ada57a94b469565ca8e -pg_repack_release: "1.4.8" -pg_repack_release_checksum: sha256:18b4d871c1abf78cf0b1b1fe6081d435d183a8dc5eb977576e7a47fe113dd4ec - pgvector_release: "0.5.1" pgvector_release_checksum: sha256:cc7a8e034a96e30a819911ac79d32f6bc47bdd1aa2de4d7d4904e26b83209dc8 diff --git a/migrations/tests/extensions/27-pg_repack.sql b/migrations/tests/extensions/27-pg_repack.sql deleted file mode 100644 index 200cf782b..000000000 --- a/migrations/tests/extensions/27-pg_repack.sql +++ /dev/null @@ -1,3 +0,0 @@ -BEGIN; -create extension if not exists pg_repack with schema "extensions"; -ROLLBACK; diff --git a/migrations/tests/extensions/test.sql b/migrations/tests/extensions/test.sql index 7e0d1f38d..820a86070 100644 --- a/migrations/tests/extensions/test.sql +++ b/migrations/tests/extensions/test.sql @@ -25,6 +25,5 @@ \ir 24-pgroonga.sql \ir 25-wrappers.sql \ir 26-hypopg.sql -\ir 27-pg_repack.sql \ir 28-pgvector.sql \ir 29-pg_tle.sql