diff --git a/Dockerfile b/Dockerfile index 20a423f..bf315d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,13 +74,15 @@ RUN set -ex; \ python3-dev \ apache-arrow-dev \ py3-pip; \ + # Upgrade pip to 24.3.1 to match the version in the ha timescaledb-docker image. + python3 -m pip install --upgrade pip==24.3.1; \ git clone --branch ${PGAI_VERSION} https://github.com/timescale/pgai.git /build/pgai; \ cd /build/pgai; \ # note: this is a hack. pyarrow will be built from source, so must be pinned to this arrow version \ - echo pyarrow==$(pkg-config --modversion arrow) >> ./projects/extension/requirements.txt; \ + echo pyarrow==$(pkg-config --modversion arrow) >> ./projects/extension/requirements-lock.txt; \ if [ "$TARGETARCH" == "386" ]; then \ # note: pinned because pandas 2.2.0-2.2.3 on i386 is affected by https://github.com/pandas-dev/pandas/issues/59905 \ - echo pandas==2.1.4 >> ./projects/extension/requirements.txt; \ + echo pandas==2.1.4 >> ./projects/extension/requirements-lock.txt; \ # note: no prebuilt binaries for pillow on i386 \ apk add --no-cache --virtual .pgai-deps-386 \ jpeg-dev \ diff --git a/Makefile b/Makefile index 050f99a..2c473c6 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ TAG=-t $(TAG_VERSION) $(if $(BETA),,-t $(TAG_LATEST)) TAG_OSS=-t $(TAG_VERSION)-oss $(if $(BETA),,-t $(TAG_LATEST)-oss) PGVECTOR_VERSION=v0.7.2 -PGAI_VERSION=extension-0.6.0 +PGAI_VERSION=extension-0.7.0 COMMON_BUILD_ARGS= --build-arg TS_VERSION=$(TS_VERSION) \ --build-arg PREV_IMAGE=$(PREV_IMAGE) \