Skip to content

Commit 18c47b7

Browse files
committed
fix: tests
1 parent cc7c3f2 commit 18c47b7

File tree

2 files changed

+23
-12
lines changed

2 files changed

+23
-12
lines changed

readme-vars.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ opt_cap_add_param: false
6262
optional_block_1: false
6363

6464
# unraid template
65-
unraid_requirement: "PostgreSQL 14/15/16 with [pgvecto.rs](https://github.com/tensorchord/pgvecto.rs), Redis"
65+
unraid_requirement: "PostgreSQL 14/15/16 with [vectorchord](https://github.com/tensorchord/VectorChord), Redis"
6666
unraid_category: "Backup: Cloud: MediaApp:Photos"
6767

6868
# application setup block
@@ -83,7 +83,7 @@ app_setup_block: |
8383
8484
### Requirements
8585
86-
- **PostgreSQL**: Version 14, 15, or 16 with [pgvecto.rs](https://github.com/tensorchord/pgvecto.rs) setup externally.
86+
- **PostgreSQL**: Version 14, 15, or 16 with [vectorchord](https://github.com/tensorchord/VectorChord) setup externally.
8787
- **Redis**: Setup externally or within the container using a docker mod.
8888
8989
#### Docker Mod for Redis
@@ -156,9 +156,11 @@ external_application_cli_block: |
156156
-e POSTGRES_USER=postgres \
157157
-e POSTGRES_PASSWORD=postgres \
158158
-e POSTGRES_DB=immich \
159+
# Uncomment the DB_STORAGE_TYPE: 'HDD' var if your database isn't stored on SSDs
160+
# -e DB_STORAGE_TYPE: 'HDD' \
159161
-v path_to_postgres:/var/lib/postgresql/data \
160162
-p 5432:5432 \
161-
tensorchord/pgvecto-rs:pg14-v0.2.0
163+
ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0
162164
external_application_compose_block: |
163165
# By default, ports for the databases are opened, be careful when deploying it
164166
# Redis:
@@ -169,14 +171,16 @@ external_application_compose_block: |
169171
container_name: redis
170172
# PostgreSQL 14:
171173
postgres14:
172-
image: tensorchord/pgvecto-rs:pg14-v0.2.0
174+
image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0
173175
ports:
174176
- 5432:5432
175177
container_name: postgres14
176178
environment:
177179
POSTGRES_USER: postgres
178180
POSTGRES_PASSWORD: postgres
179181
POSTGRES_DB: immich
182+
# Uncomment the DB_STORAGE_TYPE: 'HDD' var if your database isn't stored on SSDs
183+
# DB_STORAGE_TYPE: 'HDD'
180184
volumes:
181185
- path_to_postgres:/var/lib/postgresql/data
182186
external_application_unraid_block: |
@@ -185,7 +189,8 @@ external_application_unraid_block: |
185189
186190
# changelog
187191
changelogs:
188-
- { date: "04.04.25:", desc: "use \"SERVER_PORT\" or \"MACHINE_LEARNING_PORT\" instead of \"IMMICH_PORT\" and use \"SERVER_HOST\" or \"MACHINE_LEARNING_HOST\" instead of \"IMMICH_HOST\"" }
192+
- { date: "22.05.25:", desc: "change `pgvecto.rs` to `VectorChord`" }
193+
- { date: "04.04.25:", desc: "use `SERVER_PORT` or `MACHINE_LEARNING_PORT` instead of `IMMICH_PORT` and use `SERVER_HOST` or `MACHINE_LEARNING_HOST` instead of `IMMICH_HOST`" }
189194
- { date: "22.01.24:", desc: "support GPU acceleration with CUDA for machine-learning" }
190195
- { date: "23.12.23:", desc: "move to using seperate immich baseimage" }
191196
- { date: "07.12.23:", desc: "rebase to ubuntu mantic" }

root/etc/s6-overlay/s6-rc.d/init-test-run/run

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/usr/bin/with-contenv bash
22
# shellcheck shell=bash
33

4+
curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/pgdg-archive-keyring.gpg && \
5+
echo "deb [signed-by=/usr/share/keyrings/pgdg-archive-keyring.gpg] https://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list
6+
47
# install immich dependencies for test runs
58
if [[ -n "${TEST_RUN}" ]]; then
69
echo "Configuring CI for test run"
@@ -9,31 +12,34 @@ if [[ -n "${TEST_RUN}" ]]; then
912
postgresql* &>/dev/null
1013
apt-get install -y --no-install-recommends \
1114
postgresql-16 \
15+
postgresql-16-pgvector \
1216
redis-server &>/dev/null
1317

1418
s6-setuidgid postgres pg_ctlcluster 16 main start
1519
s6-setuidgid postgres psql -c "ALTER USER postgres WITH PASSWORD 'password';"
20+
s6-setuidgid postgres psql -c "CREATE EXTENSION vector;"
1621

1722
if [[ "$(arch)" == "x86_64" ]]; then
1823
version="amd64"
1924
else
2025
version="arm64"
2126
fi
2227

23-
# Install vectors
28+
# Install vchord
2429
curl -o \
25-
/tmp/vectors.deb -L \
26-
"https://github.com/tensorchord/pgvecto.rs/releases/download/v0.2.0/vectors-pg16_0.2.0_$version.deb"
27-
dpkg -i /tmp/vectors.deb
30+
/tmp/vchord.deb -L \
31+
"https://github.com/tensorchord/VectorChord/releases/download/0.3.0/postgresql-16-vchord_0.3.0-1_$version.deb"
32+
dpkg -i /tmp/vchord.deb
2833

29-
# Setup vectors
30-
s6-setuidgid postgres psql -c 'ALTER SYSTEM SET shared_preload_libraries = "vectors.so"'
34+
# Setup vchord
35+
s6-setuidgid postgres psql -c "ALTER EXTENSION vector UPDATE;"
36+
s6-setuidgid postgres psql -c 'ALTER SYSTEM SET shared_preload_libraries = "vchord.so"'
3137
sleep 1
3238
pkill postgres
3339
sleep 1
3440
s6-setuidgid postgres pg_ctlcluster 16 main start
3541
sleep 1
36-
s6-setuidgid postgres psql -c "CREATE EXTENSION vectors;"
42+
s6-setuidgid postgres psql -c "CREATE EXTENSION vchord CASCADE;"
3743

3844
s6-setuidgid abc redis-server --dir /config/ &>/dev/null &
3945

0 commit comments

Comments
 (0)