diff --git a/Dockerfile b/Dockerfile index 0a5c78e..959da41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ # ========================================== # Stage 1: Build # ========================================== -FROM rust:1.82-slim-bookworm AS builder +# FROM rust:1.82-slim-bookworm AS builder +FROM rust:1.89-bookworm AS builder WORKDIR /app @@ -54,14 +55,14 @@ RUN mkdir -p /app/data && chown -R bzod:bzod /app/data USER bzod ENV DATA_DIR=/app/data -ENV PORT=8080 +ENV PORT=8654 ENV HOST=0.0.0.0 ENV COOKIE_SECURE=true -EXPOSE 8080 +EXPOSE 8654 HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \ - CMD curl -f http://localhost:$${PORT:-8080}/status || exit 1 + CMD curl -f http://localhost:$${PORT:-8654}/status || exit 1 ENTRYPOINT ["bzod"] CMD ["serve"] diff --git a/docker-compose.yml b/docker-compose.yml index 11dab2a..0d7e13f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,28 +1,67 @@ +name: app-bzod + services: bzod: + image: nx9-url-shortener:v0.1.0 + build: context: . dockerfile: Dockerfile container_name: bzod - restart: unless-stopped + environment: + - COOKIE_SECURE=false + - DATA_DIR=/app/data + - HOST=0.0.0.0 + - PORT=8654 + - RUST_LOG=info ports: - - "8654:8654" + - mode: ingress + target: 8654 + published: "8654" + protocol: tcp + + restart: unless-stopped volumes: - - /DATA/AppData/bzod/data:/app/data - - /DATA/AppData/bzod/config:/app/config + - type: bind + source: /DATA/AppData/bzod/data + target: /app/data + bind: + create_host_path: true - environment: - HOST: 0.0.0.0 - PORT: 8654 - DATA_DIR: /app/data - COOKIE_SECURE: "false" + - type: bind + source: /DATA/AppData/bzod/config + target: /app/config + bind: + create_host_path: true - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8654/status"] - interval: 30s - timeout: 5s - retries: 3 + networks: + - default + + hostname: bzod + privileged: false + + cpu_shares: 90 + + deploy: + resources: + limits: + memory: 31940M + +networks: + default: + name: app_default + +x-casaos: + hostname: "" + scheme: http + index: / + port_map: "8654" + author: self + category: self + icon: "" + title: + custom: nx9-url-shortener