Skip to content

Commit 674fa4d

Browse files
committed
fix: vikunja
1 parent 0089e86 commit 674fa4d

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

templates/compose/vikunja-with-postgres.yaml renamed to templates/compose/vikunja-with-postgresql.yaml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,6 @@
55
# port: 3456
66

77
services:
8-
postgresql:
9-
image: postgres:16-alpine
10-
volumes:
11-
- vikunja-postgresql-data:/var/lib/postgresql/data
12-
environment:
13-
- POSTGRES_USER=${SERVICE_USER_POSTGRESQL}
14-
- POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
15-
- POSTGRES_DB=${POSTGRESQL_DATABASE}
16-
healthcheck:
17-
test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
18-
interval: 5s
19-
timeout: 20s
20-
retries: 10
218
vikunja:
229
image: vikunja/vikunja
2310
environment:
@@ -29,14 +16,22 @@ services:
2916
- VIKUNJA_DATABASE_HOST=postgresql
3017
- VIKUNJA_DATABASE_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
3118
- VIKUNJA_DATABASE_USER=${SERVICE_USER_POSTGRESQL}
32-
- VIKUNJA_DATABASE_DATABASE=${POSTGRESQL_DATABASE}
19+
- VIKUNJA_DATABASE_DATABASE=${POSTGRESQL_DATABASE}
3320
volumes:
3421
- vikunja-data:/app/vikunja/
3522
depends_on:
3623
postgresql:
3724
condition: service_healthy
25+
postgresql:
26+
image: postgres:16-alpine
27+
volumes:
28+
- vikunja-postgresql-data:/var/lib/postgresql/data
29+
environment:
30+
- POSTGRES_USER=${SERVICE_USER_POSTGRESQL}
31+
- POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
32+
- POSTGRES_DB=${POSTGRESQL_DATABASE}
3833
healthcheck:
39-
test: ["CMD", "wget", "--spider", "http://127.0.0.1:3456"]
34+
test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
4035
interval: 5s
4136
timeout: 20s
4237
retries: 10

templates/compose/vikunja.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ services:
1313
- VIKUNJA_SERVICE_JWTSECRET=$SERVICE_PASSWORD_JWTSECRET
1414
- VIKUNJA_SERVICE_ENABLEREGISTRATION=true
1515
- VIKUNJA_DATABASE_PATH=/db/vikunja.db
16+
- VIKUNJA_DATABASE_TYPE=sqlite
1617
volumes:
1718
- vikunja-data:/app/vikunja/
1819
- vikunja-sqlite-data:/db
19-
healthcheck:
20-
test: ["CMD", "wget", "--spider", "http://127.0.0.1:3456"]
21-
interval: 5s
22-
timeout: 20s
23-
retries: 10
20+
depends_on:
21+
- init
22+
init:
23+
image: busybox
24+
restart: no
25+
volumes:
26+
- vikunja-sqlite-data:/db
27+
command: ["sh", "-c", "touch /db/vikunja.db && chown -R 1000 /db"]

templates/service-templates.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)