From 87674dee44190386411448ba427ee4f7bf828402 Mon Sep 17 00:00:00 2001 From: pluja Date: Sun, 18 Feb 2024 23:37:33 +0100 Subject: [PATCH] update files, small fixes --- docker-compose.yml | 2 +- src/Dockerfile | 10 ++++++---- src/package-lock.json | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ce87304..99a4677 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,7 +45,7 @@ services: caddy.reverse_proxy: "{{upstreams 80}}" caddy.request_body.max_size: 10MB healthcheck: #optional (recommended) since v0.10.0 - test: wget --no-verbose --tries=1 --spider http://localhost:8090/api/health || exit 1 + test: wget --no-verbose --tries=1 --spider http://localhost:80/api/health || exit 1 interval: 5s timeout: 5s retries: 5 diff --git a/src/Dockerfile b/src/Dockerfile index 6db2984..9dad291 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -8,22 +8,24 @@ RUN chmod +x kycnotme # Tailwind CSS compiler FROM node:latest as tailwind + WORKDIR /app COPY ./package.json . COPY ./package-lock.json . COPY ./tailwind.config.js . COPY ./frontend/ /app/ + RUN npm i && \ - npx tailwindcss -i ./static/css/input.css -o ./style.css --minify + npx tailwindcss -i /app/static/css/input.css -o /app/style.css --minify FROM alpine:latest as certs RUN apk --update add ca-certificates -FROM scratch +FROM alpine:latest COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ WORKDIR /app -COPY ./frontend/ /app/frontend/ -COPY --from=tailwind /app/style.css /app/frontend/static/style.css +COPY ./frontend /app/frontend +COPY --from=tailwind /app/style.css /app/frontend/static/css/style.css COPY --from=builder /app/kycnotme /bin/usr/kycnotme ENV PATH="/bin/usr:${PATH}" diff --git a/src/package-lock.json b/src/package-lock.json index 905070b..c6c57a6 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -1,5 +1,5 @@ { - "name": "kycnotme", + "name": "src", "lockfileVersion": 3, "requires": true, "packages": {