Drop healthcheck and pass command correctly

This commit is contained in:
decentral1se 2021-05-17 16:26:58 +02:00
parent 07345b1236
commit ec8d602f3f
Signed by: decentral1se
GPG Key ID: 92DAD76BD9567B8A
2 changed files with 6 additions and 11 deletions

View File

@ -15,10 +15,8 @@ services:
- PASSWORD_FILE=/run/secrets/admin_password - PASSWORD_FILE=/run/secrets/admin_password
configs: configs:
- source: custom_entrypoint - source: custom_entrypoint
target: /usr/local/bin/docker-entrypoint.sh target: /docker-entrypoint.sh
mode: 0555 mode: 0555
entrypoint: /usr/local/bin/docker-entrypoint.sh
command: /init
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@ -28,13 +26,8 @@ services:
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
healthcheck: entrypoint: /docker-entrypoint.sh
test: command: /init
["CMD-SHELL", "wget -q --spider --proxy=off localhost:8787 || exit 1"]
interval: 30s
timeout: 10s
retries: 10
start_period: 1m
volumes: volumes:
home: home:

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -eu
file_env() { file_env() {
local var="$1" local var="$1"
@ -25,3 +25,5 @@ file_env() {
} }
file_env "PASSWORD" file_env "PASSWORD"
exec "$@"