diff --git a/Dockerfile b/Dockerfile index 64bf4f1..28a316c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,35 +1,40 @@ -ARG PG_MAJOR=16 +ARG PG_MAJOR=17 FROM postgres:$PG_MAJOR ARG PG_MAJOR +# why no apt +RUN apt update && \ + apt install -y postgresql-$PG_MAJOR-timescaledb postgresql-$PG_MAJOR-age postgresql-$PG_MAJOR-pgvector && \ + rm -rf /var/lib/apt/lists/* + # Base -RUN echo "deb http://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \ - echo "deb http://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \ - echo "deb http://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \ - echo "deb http://mirrors.tuna.tsinghua.edu.cn/debian-security bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \ - rm -rf /etc/apt/sources.list.d/debian.sources && \ - mkdir -p /tmp/build && apt-get update && \ - apt-mark hold locales && \ - apt-get install -y --no-install-recommends build-essential cmake postgresql-server-dev-$PG_MAJOR +# RUN echo "deb http://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \ +# echo "deb http://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \ +# echo "deb http://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \ +# echo "deb http://mirrors.tuna.tsinghua.edu.cn/debian-security bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \ +# rm -rf /etc/apt/sources.list.d/debian.sources && \ +# mkdir -p /tmp/build && apt-get update && \ +# apt-mark hold locales && \ +# apt-get install -y --no-install-recommends build-essential cmake postgresql-server-dev-$PG_MAJOR # PG VECTOR -COPY pgvector /tmp/build/pgvector -RUN cd /tmp/build/pgvector && \ - make clean && \ - make OPTFLAGS="" && \ - make install && \ - mkdir /usr/share/doc/pgvector && \ - cp LICENSE README.md /usr/share/doc/pgvector +# COPY pgvector /tmp/build/pgvector +# RUN cd /tmp/build/pgvector && \ +# make clean && \ +# make OPTFLAGS="" && \ +# make install && \ +# mkdir /usr/share/doc/pgvector && \ +# cp LICENSE README.md /usr/share/doc/pgvector -# TIMESCALE -COPY timescaledb /tmp/build/timescaledb -RUN cd /tmp/build/timescaledb && ./bootstrap && cd build && make && make install +# # TIMESCALE +# COPY timescaledb /tmp/build/timescaledb +# RUN cd /tmp/build/timescaledb && ./bootstrap && cd build && make && make install # CLEAN -RUN rm -r /tmp/build && \ - apt-get autoremove --purge -y build-essential git postgresql-server-dev-$PG_MAJOR && \ - apt-mark unhold locales && \ - rm -rf /var/lib/apt/lists/* \ No newline at end of file +# RUN rm -rf /tmp/build && \ +# apt-get autoremove --purge -y build-essential git postgresql-server-dev-$PG_MAJOR && \ +# apt-mark unhold locales && \ +# rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/pgvector b/pgvector deleted file mode 160000 index 3849f0f..0000000 --- a/pgvector +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3849f0fd3d6f7916de26d43e3a3c9f8e6615bc8f diff --git a/pull.sh b/pull.sh deleted file mode 100644 index 54fde12..0000000 --- a/pull.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -git clone https://github.com/pgvector/pgvector -cd pgvector && git checkout v0.7.0 - -cd .. - -git clone https://github.com/timescale/timescaledb -cd timescaledb && git checkout 2.15.0 \ No newline at end of file diff --git a/timescaledb b/timescaledb deleted file mode 160000 index f9ccf1b..0000000 --- a/timescaledb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f9ccf1be07760b77cf1faf3e639a960b9d229399