diff --git a/Dockerfile b/Dockerfile index 7d8602f..aeb83a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,18 +13,11 @@ FROM build-deps AS build COPY . . -ARG POCKETBASE_URL -ENV POCKETBASE_URL=${POCKETBASE_URL} - RUN npm run build FROM base AS runtime COPY --from=prod-deps /app/node_modules ./node_modules COPY --from=build /app/dist ./dist -ARG PORT=4321 -ENV HOST=0.0.0.0 -ENV PORT=${PORT} -ENV POCKETBASE_URL=${POCKETBASE_URL} -EXPOSE ${PORT} -CMD node ./dist/server/entry.mjs \ No newline at end of file +EXPOSE 4321 +CMD ['node', './dist/server/entry.mjs'] \ No newline at end of file diff --git a/compose.yml b/compose.yml index 53fa8ce..fb700b9 100644 --- a/compose.yml +++ b/compose.yml @@ -3,47 +3,33 @@ services: build: context: . dockerfile: Dockerfile - args: - PUBLIC_POCKETBASE_URL: ${PUBLIC_POCKETBASE_URL} - PUBLIC_TITLE: ${PUBLIC_TITLE} - PUBLIC_DESCRIPTION: ${PUBLIC_DESCRIPTION} - PUBLIC_USEICONS: ${PUBLIC_USEICONS} env_file: .env - networks: - - caddy - labels: - caddy: lion.gay - caddy.reverse_proxy: "{{upstreams 4321}}" + ports: + - 4321:4321 pocketbase: image: ghcr.io/muchobien/pocketbase:latest container_name: pocketbase-gallery restart: unless-stopped - networks: - - caddy + ports: + - "8090:8090" volumes: - /opt/pocketbase/pb_data:/pb_data - /opt/pocketbase/pb_public:/pb_public - labels: - caddy: pocket.fangs.app - caddy.reverse_proxy: "{{upstreams 8090}}" - caddy: - container_name: "caddy-gallery" - image: videah/caddy-proxy:latest - ports: - - "80:80" - - "443:443" - - "443:443/udp" - environment: - - CADDY_INGRESS_NETWORKS=caddy - networks: - - caddy - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - caddy_data:/data - restart: unless-stopped - labels: - caddy.email: "caddy@lion.gay" - caddy.encode: zstd gzip + # caddy: + # container_name: "caddy-gallery" + # image: videah/caddy-proxy:latest + # ports: + # - "80:80" + # - "443:443" + # - "443:443/udp" + # environment: + # - CADDY_INGRESS_NETWORKS=caddy + # networks: + # - caddy + # volumes: + # - /var/run/docker.sock:/var/run/docker.sock + # - caddy_data:/data + # restart: unless-stopped networks: caddy: