diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 37508c8..517dc41 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -265,7 +265,7 @@ jobs: image: $REGISTRY/wordpdf-web:prod restart: on-failure:5 healthcheck: - test: ["CMD-SHELL", "http_proxy= https_proxy= wget -qO /dev/null http://127.0.0.1/ || exit 1"] + test: ["CMD-SHELL", "HTTP_PROXY= http_proxy= HTTPS_PROXY= https_proxy= wget -qO /dev/null http://127.0.0.1/ || exit 1"] interval: 10s timeout: 3s start_period: 10s diff --git a/compose.dev.yml b/compose.dev.yml index daeda64..a0138af 100644 --- a/compose.dev.yml +++ b/compose.dev.yml @@ -26,7 +26,7 @@ services: restart: unless-stopped # См. комментарий у app: дубль HEALTHCHECK из wordpdf-web/Containerfile healthcheck: - test: ["CMD-SHELL", "http_proxy= https_proxy= wget -qO /dev/null http://127.0.0.1/ || exit 1"] + test: ["CMD-SHELL", "HTTP_PROXY= http_proxy= HTTPS_PROXY= https_proxy= wget -qO /dev/null http://127.0.0.1/ || exit 1"] interval: 10s timeout: 3s start_period: 10s diff --git a/compose.yml b/compose.yml index 3d7080d..fd075d3 100644 --- a/compose.yml +++ b/compose.yml @@ -32,7 +32,7 @@ services: restart: unless-stopped # См. комментарий у app: дубль HEALTHCHECK из wordpdf-web/Containerfile healthcheck: - test: ["CMD-SHELL", "http_proxy= https_proxy= wget -qO /dev/null http://127.0.0.1/ || exit 1"] + test: ["CMD-SHELL", "HTTP_PROXY= http_proxy= HTTPS_PROXY= https_proxy= wget -qO /dev/null http://127.0.0.1/ || exit 1"] interval: 10s timeout: 3s start_period: 10s diff --git a/wordpdf-web/Containerfile b/wordpdf-web/Containerfile index 5c0176d..b21d6e5 100644 --- a/wordpdf-web/Containerfile +++ b/wordpdf-web/Containerfile @@ -19,4 +19,4 @@ FROM docker.io/library/nginx:alpine COPY --from=build /build/dist /usr/share/nginx/html # прокси-переменные хоста подмешиваются в HEALTHCHECK-шелл — обнуляем на команде HEALTHCHECK --interval=10s --timeout=3s --start-period=10s \ - CMD http_proxy= https_proxy= wget -qO /dev/null http://127.0.0.1/ || exit 1 + CMD HTTP_PROXY= http_proxy= HTTPS_PROXY= https_proxy= wget -qO /dev/null http://127.0.0.1/ || exit 1