mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
fix(docker): fix ca entrypoint logic and healthcheck
With this commit, it is advised to `rm ./data/root_ca.crt ./data/*.pem`, as new certificates and a root CA will be generated while utilizing the step volume. Closes #367 Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
parent
6f7ac33166
commit
d63615a994
3 changed files with 34 additions and 40 deletions
|
@ -31,8 +31,10 @@ services:
|
|||
entrypoint: /docker/ca-entrypoint.sh
|
||||
command: /docker/scripts/run-ca.sh
|
||||
healthcheck:
|
||||
test: "bash /docker/health/run-ca.sh"
|
||||
interval: 2s
|
||||
test: "bash /docker/health/ca.sh"
|
||||
interval: 3s
|
||||
volumes:
|
||||
- step:/root/.step
|
||||
|
||||
memcached:
|
||||
image: aurweb:latest
|
||||
|
@ -40,7 +42,7 @@ services:
|
|||
command: /docker/scripts/run-memcached.sh
|
||||
healthcheck:
|
||||
test: "bash /docker/health/memcached.sh"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
|
||||
redis:
|
||||
image: aurweb:latest
|
||||
|
@ -49,7 +51,7 @@ services:
|
|||
command: /docker/scripts/run-redis.sh
|
||||
healthcheck:
|
||||
test: "bash /docker/health/redis.sh"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
ports:
|
||||
- "127.0.0.1:16379:6379"
|
||||
|
||||
|
@ -67,7 +69,7 @@ services:
|
|||
- mariadb_data:/var/lib/mysql
|
||||
healthcheck:
|
||||
test: "bash /docker/health/mariadb.sh"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
|
||||
mariadb_init:
|
||||
image: aurweb:latest
|
||||
|
@ -98,7 +100,7 @@ services:
|
|||
- mariadb_test_run:/var/run/mysqld # Bind socket in this volume.
|
||||
healthcheck:
|
||||
test: "bash /docker/health/mariadb.sh"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
|
||||
git:
|
||||
image: aurweb:latest
|
||||
|
@ -113,7 +115,7 @@ services:
|
|||
- "2222:2222"
|
||||
healthcheck:
|
||||
test: "bash /docker/health/sshd.sh"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
depends_on:
|
||||
mariadb_init:
|
||||
condition: service_started
|
||||
|
@ -129,7 +131,7 @@ services:
|
|||
command: /docker/scripts/run-smartgit.sh
|
||||
healthcheck:
|
||||
test: "bash /docker/health/smartgit.sh"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
|
||||
cgit-php:
|
||||
image: aurweb:latest
|
||||
|
@ -142,7 +144,7 @@ services:
|
|||
command: /docker/scripts/run-cgit.sh 3000
|
||||
healthcheck:
|
||||
test: "bash /docker/health/cgit.sh 3000"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
depends_on:
|
||||
git:
|
||||
condition: service_healthy
|
||||
|
@ -162,7 +164,7 @@ services:
|
|||
command: /docker/scripts/run-cgit.sh 3000
|
||||
healthcheck:
|
||||
test: "bash /docker/health/cgit.sh 3000"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
depends_on:
|
||||
git:
|
||||
condition: service_healthy
|
||||
|
@ -199,7 +201,7 @@ services:
|
|||
command: /docker/scripts/run-php.sh
|
||||
healthcheck:
|
||||
test: "bash /docker/health/php.sh"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
depends_on:
|
||||
git:
|
||||
condition: service_healthy
|
||||
|
@ -228,7 +230,7 @@ services:
|
|||
command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
|
||||
healthcheck:
|
||||
test: "bash /docker/health/fastapi.sh ${FASTAPI_BACKEND}"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
depends_on:
|
||||
git:
|
||||
condition: service_healthy
|
||||
|
@ -254,10 +256,10 @@ services:
|
|||
- "127.0.0.1:8444:8444" # FastAPI
|
||||
healthcheck:
|
||||
test: "bash /docker/health/nginx.sh"
|
||||
interval: 2s
|
||||
interval: 3s
|
||||
depends_on:
|
||||
ca:
|
||||
condition: service_started
|
||||
condition: service_healthy
|
||||
cgit-php:
|
||||
condition: service_healthy
|
||||
cgit-fastapi:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue