From c6fe84d7309de09483edde41e444284de8219205 Mon Sep 17 00:00:00 2001 From: Aleksandr Soloshenko Date: Wed, 23 Jul 2025 11:20:23 +0700 Subject: [PATCH] [package] use curl for healthcheck --- Makefile | 6 +++--- build/package/Dockerfile | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e17c014..275da27 100644 --- a/Makefile +++ b/Makefile @@ -48,10 +48,10 @@ docker-build: docker build -f build/package/Dockerfile -t $(image_name) --build-arg APP=$(project_name) . docker: - docker-compose -f deployments/docker-compose/docker-compose.yml up --build + docker compose -f deployments/docker-compose/docker-compose.yml up --build docker-dev: - docker-compose -f deployments/docker-compose/docker-compose.dev.yml up --build + docker compose -f deployments/docker-compose/docker-compose.dev.yml up --build api-docs: swag fmt -g ./cmd/$(project_name)/main.go \ @@ -61,6 +61,6 @@ view-docs: php -S 127.0.0.1:8080 -t ./api clean: - docker-compose -f deployments/docker-compose/docker-compose.yml down --volumes + docker compose -f deployments/docker-compose/docker-compose.yml down --volumes .PHONY: init init-dev air db-upgrade db-upgrade-raw run test build install docker docker-dev api-docs view-docs clean \ No newline at end of file diff --git a/build/package/Dockerfile b/build/package/Dockerfile index 44f112f..1d342da 100644 --- a/build/package/Dockerfile +++ b/build/package/Dockerfile @@ -33,7 +33,8 @@ FROM alpine:3 AS prod WORKDIR /app -RUN apk add --no-cache tzdata +RUN apk add --no-cache tzdata \ + curl COPY scripts/docker-entrypoint.sh /docker-entrypoint.sh @@ -43,6 +44,6 @@ COPY --from=build /go/src/app /app EXPOSE 3000 USER guest -HEALTHCHECK --interval=10s --timeout=3s --retries=3 --start-period=5s CMD /app/app health || exit 1 +HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 CMD curl -fs http://localhost:3000/health ENTRYPOINT ["/docker-entrypoint.sh"]