Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
ARG PG_VERSION=17
ARG PGVECTOR_VERSION=0.8.0
ARG POSTGIS_VERSION=3.5.1
ARG PG_TEXTSEARCH_VERSION=0.6.0
# Pin to main branch commit that includes the ResourceOwnerEnlarge crash fix (PR #248)
# No tagged release includes this fix yet (latest release is v0.5.1)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Incorrect comment states latest release is v0.5.1 when old code used v0.6.0

The comment on line 8 says "No tagged release includes this fix yet (latest release is v0.5.1)" but the previous Dockerfile was using PG_TEXTSEARCH_VERSION=0.6.0, meaning v0.6.0 exists as a tagged release. This misleading comment could confuse maintainers about when to switch back to a tagged release, potentially causing them to miss a future release that actually includes the fix.

Suggested change
# No tagged release includes this fix yet (latest release is v0.5.1)
# No tagged release includes this fix yet (latest release is v0.6.0)
Open in Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

ARG PG_TEXTSEARCH_COMMIT=ad4f8328780367526fce8997207fa701ef4d014d

#############################################
# Stage 1: Build extensions
Expand All @@ -13,7 +15,7 @@ FROM postgres:${PG_VERSION}-alpine AS builder

ARG PGVECTOR_VERSION
ARG POSTGIS_VERSION
ARG PG_TEXTSEARCH_VERSION
ARG PG_TEXTSEARCH_COMMIT

RUN apk add --no-cache \
git \
Expand Down Expand Up @@ -54,8 +56,11 @@ RUN curl -L https://download.osgeo.org/postgis/source/postgis-${POSTGIS_VERSION}
make install

# pg_textsearch (BM25)
RUN git clone --branch v${PG_TEXTSEARCH_VERSION} --depth 1 https://github.com/timescale/pg_textsearch.git && \
# Build from main at a specific commit to include the ResourceOwnerEnlarge
# crash fix (PR #248, issue #247). No tagged release includes this fix yet.
RUN git clone https://github.com/timescale/pg_textsearch.git && \
cd pg_textsearch && \
git checkout ${PG_TEXTSEARCH_COMMIT} && \
make -j$(nproc) && \
make install

Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ test: build
CREATE EXTENSION vector; \
CREATE EXTENSION postgis; \
CREATE EXTENSION pg_textsearch; \
CREATE EXTENSION pgsodium; \
SELECT 'all extensions OK';"
@docker stop $(CONTAINER_NAME)-test > /dev/null
@docker rm $(CONTAINER_NAME)-test > /dev/null
Expand Down