diff --git a/auth/Dockerfile b/auth/Dockerfile index 7c587b72..35654b31 100644 --- a/auth/Dockerfile +++ b/auth/Dockerfile @@ -23,5 +23,5 @@ USER nonroot:nonroot COPY --from=build /keibi /app/keibi COPY sql ./sql -HEALTHCHECK --interval=5s --retries=15 CMD curl --fail http://localhost:4568$KEIBI_PREFIX/health || exit +HEALTHCHECK --interval=30s --retries=15 CMD curl --fail http://localhost:4568$KEIBI_PREFIX/health || exit CMD ["/app/keibi"] diff --git a/auth/Dockerfile.dev b/auth/Dockerfile.dev index 82b53242..fbbb7edf 100644 --- a/auth/Dockerfile.dev +++ b/auth/Dockerfile.dev @@ -7,5 +7,5 @@ COPY go.mod go.sum ./ RUN go mod download EXPOSE 4568 -HEALTHCHECK --interval=5s --retries=15 CMD curl --fail http://localhost:4568$KEIBI_PREFIX/health || exit +HEALTHCHECK --interval=30s --retries=15 CMD curl --fail http://localhost:4568$KEIBI_PREFIX/health || exit CMD ["wgo", "run", "-race", "."] diff --git a/back/Dockerfile b/back/Dockerfile index b2c5e2b4..4bbc4f5b 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -25,5 +25,5 @@ COPY --from=builder /app /app WORKDIR /app EXPOSE 5000 # The back can take a long time to start if meilisearch is initializing -HEALTHCHECK --interval=5s --retries=15 CMD curl --fail http://localhost:5000/health || exit +HEALTHCHECK --interval=30s --retries=15 CMD curl --fail http://localhost:5000/health || exit ENTRYPOINT ["/app/kyoo"] diff --git a/back/Dockerfile.dev b/back/Dockerfile.dev index e33a87a5..b4428070 100644 --- a/back/Dockerfile.dev +++ b/back/Dockerfile.dev @@ -17,6 +17,6 @@ RUN dotnet restore WORKDIR /app EXPOSE 5000 ENV DOTNET_USE_POLLING_FILE_WATCHER 1 -# HEALTHCHECK --interval=5s CMD curl --fail http://localhost:5000/health || exit +# HEALTHCHECK --interval=30s CMD curl --fail http://localhost:5000/health || exit HEALTHCHECK CMD true ENTRYPOINT ["dotnet", "watch", "--non-interactive", "run", "--no-restore", "--project", "/app/src/Kyoo.Core"] diff --git a/docker-compose.dev-v5.yml b/docker-compose.dev-v5.yml index fda1355a..ab734ca1 100644 --- a/docker-compose.dev-v5.yml +++ b/docker-compose.dev-v5.yml @@ -61,6 +61,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.auth.rule=PathPrefix(`/auth/`)" + - "traefik.http.routers.auth.rule=PathPrefix(`/.well-known/`)" api: build: @@ -161,7 +162,6 @@ services: - "--providers.docker.exposedbydefault=false" - "--entryPoints.web.address=:8901" - "--accesslog=true" - - "--log.level=DEBUG" ports: - "8901:8901" volumes: