Skip to content

Commit 18014de

Browse files
committed
fix: tests
1 parent a101317 commit 18014de

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

readme-vars.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ opt_param_env_vars:
4747
- { env_var: "DB_PORT", env_value: "5432", desc: "PostgreSQL Port" }
4848
- { env_var: "REDIS_PORT", env_value: "6379", desc: "Redis Port" }
4949
- { env_var: "REDIS_PASSWORD", env_value: "", desc: "Redis password" }
50+
- { env_var: "SERVER_HOST", env_value: "0.0.0.0", desc: "Immich server host" }
51+
- { env_var: "SERVER_PORT", env_value: "8080", desc: "Immich server port" }
5052
- { env_var: "MACHINE_LEARNING_HOST", env_value: "0.0.0.0", desc: "Immich machine-learning host" }
5153
- { env_var: "MACHINE_LEARNING_PORT", env_value: "3003", desc: "Immich machine-learning port" }
5254
- { env_var: "MACHINE_LEARNING_WORKERS", env_value: "1", desc: "Machine learning workers" }
@@ -60,7 +62,7 @@ opt_cap_add_param: false
6062
optional_block_1: false
6163

6264
# unraid template
63-
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"
6466
unraid_category: "Backup: Cloud: MediaApp:Photos"
6567

6668
# application setup block
@@ -83,9 +85,11 @@ external_application_cli_block: |
8385
-e POSTGRES_USER=postgres \
8486
-e POSTGRES_PASSWORD=postgres \
8587
-e POSTGRES_DB=immich \
88+
# Uncomment the DB_STORAGE_TYPE: 'HDD' var if your database isn't stored on SSDs
89+
# -e DB_STORAGE_TYPE: 'HDD' \
8690
-v path_to_postgres:/var/lib/postgresql/data \
8791
-p 5432:5432 \
88-
tensorchord/pgvecto-rs:pg14-v0.2.0
92+
ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0
8993
external_application_compose_block: |
9094
# By default, ports for the databases are opened, be careful when deploying it
9195
# Redis:
@@ -96,14 +100,16 @@ external_application_compose_block: |
96100
container_name: redis
97101
# PostgreSQL 14:
98102
postgres14:
99-
image: tensorchord/pgvecto-rs:pg14-v0.2.0
103+
image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0
100104
ports:
101105
- 5432:5432
102106
container_name: postgres14
103107
environment:
104108
POSTGRES_USER: postgres
105109
POSTGRES_PASSWORD: postgres
106110
POSTGRES_DB: immich
111+
# Uncomment the DB_STORAGE_TYPE: 'HDD' var if your database isn't stored on SSDs
112+
# DB_STORAGE_TYPE: 'HDD'
107113
volumes:
108114
- path_to_postgres:/var/lib/postgresql/data
109115
external_application_unraid_block: |
@@ -112,6 +118,8 @@ external_application_unraid_block: |
112118
113119
# changelog
114120
changelogs:
121+
- { date: "22.05.25:", desc: "change `pgvecto.rs` to `VectorChord`" }
122+
- { 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`" }
115123
- { date: "22.01.24:", desc: "support GPU acceleration with CUDA for machine-learning" }
116124
- { date: "23.12.23:", desc: "move to using seperate immich baseimage" }
117125
- { 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)