Skip to content

Commit aed89e6

Browse files
committed
added pgvector and pgextwlist to postgis image
1 parent 9573c84 commit aed89e6

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ docker/postgres-oracle
44
docker/newpg
55
docker/benchmark
66
docker/pgbackrest-old
7+
setup/helm/pgcluster
78

89
#FerretDB
910
docker/ferretdb
@@ -16,4 +17,5 @@ launcher/exporter_v2
1617

1718
# logical backup
1819
docker/logical_backup/
19-
scripts/logical_backup/
20+
scripts/logical_backup/
21+

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ PGBACKREST_VERSION ?= 2.54.2
1313
POSTGIS_VERSION ?= 34
1414
ETCD_VERSION ?= 3.5.18
1515
PGBOUNCER_VERSION ?= 1.24
16+
PGVECTOR ?= v0.8.0
1617
PACKAGER ?= dnf
1718
BUILD ?= 1
1819
ARCH ?= amd64
@@ -87,6 +88,7 @@ postgres-build:
8788
--build-arg PGVERSION=$(PGVERSION) \
8889
--build-arg ETCD_VERSION=$(ETCD_VERSION) \
8990
--build-arg PGVERSION=$(PGVERSION) \
91+
--build-arg PGVECTOR=$(PGVECTOR) \
9092
--build-arg ARCH=$(ARCH)
9193

9294
postgres: postgres-build
@@ -108,6 +110,7 @@ postgres-gis-build:
108110
--build-arg PGVERSION=$(PGVERSION) \
109111
--build-arg POSTGIS_VERSION=$(POSTGIS_VERSION) \
110112
--build-arg ETCD_VERSION=$(ETCD_VERSION) \
113+
--build-arg PGVECTOR=$(PGVECTOR) \
111114
--build-arg ARCH=$(ARCH)
112115

113116
postgres-gis: postgres-gis-build

docker/postgres-gis/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ARG PG_SUPPORTED_VERSIONS="$PGVERSION"
1515
ARG PG_SUPPORTED_VERSIONS="$OLD_PG_VERSIONS $PGVERSION"
1616
ARG POSTGIS_VERSION
1717
ARG ETCD_VERSION
18+
ARG PGVECTOR
1819
ARG ARCH
1920

2021
# Spilo-specific
@@ -84,7 +85,8 @@ RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python
8485
&& mkdir /usr/lib/postgresql \
8586
&& git clone -b $PG_PERMISSIONS https://github.com/cybertec-postgresql/pg_permissions.git \
8687
&& git clone -b $SET_USER https://github.com/pgaudit/set_user.git \
87-
#&& git clone https://github.com/dimitri/pgextwlist.git \
88+
&& git clone -b $PGVECTOR https://github.com/pgvector/pgvector.git \
89+
&& git clone https://github.com/dimitri/pgextwlist.git \
8890
&& git clone https://github.com/crunchydata/pgnodemx \
8991
\
9092
&& ${PACKAGER} -y install --nodocs --noplugins --setopt=install_weak_deps=0 postgresql${PGVERSION} libevent-devel brotli-devel libbrotli \
@@ -111,11 +113,11 @@ RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python
111113
# Install TimescaleDB
112114
&& ${PACKAGER} -y install timescaledb_${version} \
113115
&& cd / \
114-
&& for n in set_user pg_permissions $EXTRA_EXTENSIONS; do \
116+
&& for n in set_user pg_permissions pgvector $EXTRA_EXTENSIONS; do \
115117
#pg_profile-${PG_PROFILE} pg_tm_aux-${PG_TM_AUX_COMMIT} bg_mon-${BG_MON_COMMIT} pg_auth_mon-${PG_AUTH_MON_COMMIT}
116118
make -C $n USE_PGXS=1 clean install-strip; \
117119
done \
118-
#&& cd /pgextwlist && make clean && make && make install \
120+
&& cd /pgextwlist && make clean && make && make install \
119121
&& cd /pgnodemx && make USE_PGXS=1 clean && make USE_PGXS=1 && make USE_PGXS=1 install; \
120122
done \
121123
&& ${PACKAGER} -y install --nodocs --noplugins --setopt=install_weak_deps=0 glibc-static \
@@ -125,7 +127,7 @@ RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python
125127
RUN cd /package && tar -xvzf runit-2.1.2.tar.gz && rm runit-2.1.2.tar.gz \
126128
&& cd admin/runit-2.1.2 && package/install \
127129
&& ln -s /usr/local/bin/runsvdir /usr/bin/runsvdir \
128-
&& rm -rf /pg_permissions /pgextwlist /pg_stat_kcache /pgnodemx /timescaledb /set_user /pam-oauth2 \
130+
&& rm -rf /pg_permissions /pgextwlist /pg_stat_kcache /pgvector /pgnodemx /timescaledb /set_user /pam-oauth2 \
129131
&& rm /etc/pgbackrest.conf && rm -rf /var/spool/pgbackrest \
130132
&& ${PACKAGER} -y remove $(rpm -qa "*devel*") python3-pip python3-wheel python3-dev python3-setuptools git patchutils flatpak glibc-static gcc glibc-devel --exclude libgeotiff17-devel --exclude libtiff-devel --exclude libspatialite50-devel \
131133
&& ${PACKAGER} -y autoremove \

docker/postgres/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ARG OLD_PG_VERSIONS
1414
ARG PG_SUPPORTED_VERSIONS="$PGVERSION"
1515
ARG PG_SUPPORTED_VERSIONS="$OLD_PG_VERSIONS $PGVERSION"
1616
ARG ETCD_VERSION
17+
ARG PGVECTOR
1718
ARG ARCH
1819

1920
# Spilo-specific
@@ -83,7 +84,8 @@ RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python
8384
&& mkdir /usr/lib/postgresql \
8485
&& git clone -b $PG_PERMISSIONS https://github.com/cybertec-postgresql/pg_permissions.git \
8586
&& git clone -b $SET_USER https://github.com/pgaudit/set_user.git \
86-
#&& git clone https://github.com/dimitri/pgextwlist.git \
87+
&& git clone -b $PGVECTOR https://github.com/pgvector/pgvector.git \
88+
&& git clone https://github.com/dimitri/pgextwlist.git \
8789
&& git clone https://github.com/crunchydata/pgnodemx \
8890
\
8991
&& ${PACKAGER} -y install --nodocs --noplugins --setopt=install_weak_deps=0 postgresql${PGVERSION} libevent-devel brotli-devel libbrotli \
@@ -108,11 +110,11 @@ RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python
108110
# Install TimescaleDB
109111
&& ${PACKAGER} -y install timescaledb_${version} \
110112
&& cd / \
111-
&& for n in set_user pg_permissions $EXTRA_EXTENSIONS; do \
113+
&& for n in set_user pg_permissions pgvector $EXTRA_EXTENSIONS; do \
112114
#pg_profile-${PG_PROFILE} pg_tm_aux-${PG_TM_AUX_COMMIT} bg_mon-${BG_MON_COMMIT} pg_auth_mon-${PG_AUTH_MON_COMMIT}
113115
make -C $n USE_PGXS=1 clean install-strip; \
114116
done \
115-
#&& cd /pgextwlist && make clean && make && make install \
117+
&& cd /pgextwlist && make clean && make && make install \
116118
&& cd /pgnodemx && make USE_PGXS=1 clean && make USE_PGXS=1 && make USE_PGXS=1 install; \
117119
done \
118120
&& ${PACKAGER} -y install --nodocs --noplugins --setopt=install_weak_deps=0 glibc-static \
@@ -122,7 +124,7 @@ RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python
122124
RUN cd /package && tar -xvzf runit-2.1.2.tar.gz && rm runit-2.1.2.tar.gz \
123125
&& cd admin/runit-2.1.2 && package/install \
124126
&& ln -s /usr/local/bin/runsvdir /usr/bin/runsvdir \
125-
&& rm -rf /pg_permissions /pgextwlist /pg_stat_kcache /pgnodemx /timescaledb /set_user /pam-oauth2 \
127+
&& rm -rf /pg_permissions /pgextwlist /pg_stat_kcache /pgvector /pgnodemx /timescaledb /set_user /pam-oauth2 \
126128
&& rm /etc/pgbackrest.conf && rm -rf /var/spool/pgbackrest \
127129
&& ${PACKAGER} -y remove $(rpm -qa "*devel*") python3-pip python3-wheel python3-dev python3-setuptools git patchutils flatpak glibc-static gcc glibc-devel \
128130
&& ${PACKAGER} -y autoremove \

0 commit comments

Comments
 (0)