mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
Docker: remove intervals and timeouts
These weren't needed at all and provided false negatives in general. Removed them to let Docker deal with them. Additionally. 'exit 0' -> 'echo' for ca's command; 'exit 0' happens to depend on the shell running Docker (it seems). echo is quite a bit more agnostic. Moreso, added mariadb deps to php-fpm and fastapi. Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
parent
4ade8b0539
commit
ae0f69a5e4
1 changed files with 5 additions and 17 deletions
|
@ -25,7 +25,7 @@ services:
|
||||||
image: aurweb:latest
|
image: aurweb:latest
|
||||||
init: true
|
init: true
|
||||||
entrypoint: /docker/ca-entrypoint.sh
|
entrypoint: /docker/ca-entrypoint.sh
|
||||||
command: exit 0
|
command: echo
|
||||||
volumes:
|
volumes:
|
||||||
- ./cache:/cache
|
- ./cache:/cache
|
||||||
|
|
||||||
|
@ -45,8 +45,6 @@ services:
|
||||||
- mariadb_data:/var/lib/mysql
|
- mariadb_data:/var/lib/mysql
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "bash /docker/health/mariadb.sh"
|
test: "bash /docker/health/mariadb.sh"
|
||||||
interval: 2s
|
|
||||||
timeout: 60s
|
|
||||||
|
|
||||||
git:
|
git:
|
||||||
image: aurweb:latest
|
image: aurweb:latest
|
||||||
|
@ -59,8 +57,6 @@ services:
|
||||||
- "2222:2222"
|
- "2222:2222"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "bash /docker/health/sshd.sh"
|
test: "bash /docker/health/sshd.sh"
|
||||||
interval: 2s
|
|
||||||
timeout: 30s
|
|
||||||
depends_on:
|
depends_on:
|
||||||
mariadb:
|
mariadb:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
@ -79,8 +75,6 @@ services:
|
||||||
command: /docker/scripts/run-smartgit.sh
|
command: /docker/scripts/run-smartgit.sh
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "bash /docker/health/smartgit.sh"
|
test: "bash /docker/health/smartgit.sh"
|
||||||
interval: 2s
|
|
||||||
timeout: 30s
|
|
||||||
depends_on:
|
depends_on:
|
||||||
mariadb:
|
mariadb:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
@ -100,11 +94,11 @@ services:
|
||||||
command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8443/cgit"
|
command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8443/cgit"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "bash /docker/health/cgit.sh 3000"
|
test: "bash /docker/health/cgit.sh 3000"
|
||||||
interval: 2s
|
|
||||||
timeout: 30s
|
|
||||||
depends_on:
|
depends_on:
|
||||||
git:
|
git:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
php-fpm:
|
||||||
|
condition: service_healthy
|
||||||
volumes:
|
volumes:
|
||||||
- git_data:/aurweb/aur.git
|
- git_data:/aurweb/aur.git
|
||||||
|
|
||||||
|
@ -117,11 +111,11 @@ services:
|
||||||
command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8444/cgit"
|
command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8444/cgit"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "bash /docker/health/cgit.sh 3000"
|
test: "bash /docker/health/cgit.sh 3000"
|
||||||
interval: 2s
|
|
||||||
timeout: 30s
|
|
||||||
depends_on:
|
depends_on:
|
||||||
git:
|
git:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
fastapi:
|
||||||
|
condition: service_healthy
|
||||||
volumes:
|
volumes:
|
||||||
- git_data:/aurweb/aur.git
|
- git_data:/aurweb/aur.git
|
||||||
|
|
||||||
|
@ -135,8 +129,6 @@ services:
|
||||||
command: /docker/scripts/run-php.sh
|
command: /docker/scripts/run-php.sh
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "bash /docker/health/php.sh"
|
test: "bash /docker/health/php.sh"
|
||||||
interval: 2s
|
|
||||||
timeout: 30s
|
|
||||||
depends_on:
|
depends_on:
|
||||||
ca:
|
ca:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
|
@ -166,8 +158,6 @@ services:
|
||||||
command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
|
command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "bash /docker/health/fastapi.sh ${FASTAPI_BACKEND}"
|
test: "bash /docker/health/fastapi.sh ${FASTAPI_BACKEND}"
|
||||||
interval: 2s
|
|
||||||
timeout: 30s
|
|
||||||
depends_on:
|
depends_on:
|
||||||
ca:
|
ca:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
|
@ -199,8 +189,6 @@ services:
|
||||||
- "8444:8444" # FastAPI
|
- "8444:8444" # FastAPI
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "bash /docker/health/nginx.sh"
|
test: "bash /docker/health/nginx.sh"
|
||||||
interval: 2s
|
|
||||||
timeout: 30s
|
|
||||||
depends_on:
|
depends_on:
|
||||||
cgit-php:
|
cgit-php:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
Loading…
Add table
Reference in a new issue