diff --git a/Dockerfile b/Dockerfile index 1820280b..afebca75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -172,7 +172,7 @@ RUN set -eux; \ postgresql-${pg}-pg-stat-kcache postgresql-${pg}-cron postgresql-${pg}-pldebugger postgresql-${pg}-pgpcre \ postgresql-${pg}-pglogical postgresql-${pg}-wal2json postgresql-${pg}-pgq3 postgresql-${pg}-pg-qualstats \ postgresql-${pg}-pgaudit postgresql-${pg}-ip4r postgresql-${pg}-pgtap postgresql-${pg}-orafce \ - postgresql-${pg}-pgvector"; \ + postgresql-${pg}-pgvector postgresql-${pg}-h3"; \ done; \ apt-get install -y $packages @@ -197,22 +197,6 @@ RUN set -eux; \ done; \ done -# h3 has to use cmake in order to allow installing on anything but the latest version of pg that it finds -ARG H3 -RUN set -ex; \ - if [ -n "${H3}" ]; then \ - cd /build; \ - git clone https://github.com/zachasme/h3-pg.git; \ - cd h3-pg; \ - git checkout "${H3}"; \ - for pg in ${PG_VERSIONS}; do \ - rm -fr build* >/dev/null 2>&1; \ - cmake -B build -DCMAKE_BUILD_TYPE=Release -DPostgreSQL_ADDITIONAL_VERSIONS="${pg}"; \ - cmake --build build; \ - cmake --install build --component h3-pg; \ - done; \ - fi - ARG PGVECTO_RS RUN set -ex; \ if [ -n "${PGVECTO_RS}" ]; then \ diff --git a/Makefile b/Makefile index 830ce054..9bf2072a 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,6 @@ PG_AUTH_MON?=v2.0 PG_STAT_MONITOR?=2.0.3 PG_LOGERRORS?=18d9795 PGVECTO_RS?=0.2.0 -H3?=v4.1.3 TIMESCALEDB_VERSIONS?=all PROMSCALE_VERSIONS?=all TOOLKIT_VERSIONS?=all @@ -125,7 +124,6 @@ DOCKER_BUILD_COMMAND=docker build \ --build-arg PROMSCALE_VERSIONS="$(PROMSCALE_VERSIONS)" \ --build-arg TOOLKIT_VERSIONS="$(TOOLKIT_VERSIONS)" \ --build-arg PGVECTO_RS="$(PGVECTO_RS)" \ - --build-arg H3="$(H3)" \ --build-arg RELEASE_URL="$(DOCKER_RELEASE_URL)" \ --build-arg BUILDER_URL="$(DOCKER_BUILDER_URL)" \ --build-arg PGBOUNCER_EXPORTER_VERSION=$(PGBOUNCER_EXPORTER_VERSION) \