diff --git a/stacks/perilous/Dockerfile b/stacks/perilous/Dockerfile index 27489f6..8b8a457 100644 --- a/stacks/perilous/Dockerfile +++ b/stacks/perilous/Dockerfile @@ -1,7 +1,7 @@ FROM node:18-alpine +RUN apk add --no-cache python3 make g++ vips-dev WORKDIR /usr/src/app -COPY package.json ./ +COPY content/package.json ./ RUN npm install -COPY server.js ./ EXPOSE 3000 -CMD ["node", "server.js"] +CMD ["node", "content/server.js"] diff --git a/stacks/perilous/docker-compose.yml b/stacks/perilous/docker-compose.yml index 132432d..19dae72 100644 --- a/stacks/perilous/docker-compose.yml +++ b/stacks/perilous/docker-compose.yml @@ -7,11 +7,8 @@ services: - "3003:3000" volumes: - ./content:/usr/src/app/content - labels: - - "traefik.enable=true" - - "traefik.http.routers.perilous-secure.entrypoints=https,http" - - "traefik.http.routers.perilous-secure.rule=Host(`chapel.perilous.dev`,`forest.perilous.dev`,`castle.perilous.dev`,`siege.perilous.dev`,`pass.perilous.dev`,`perilous.dev`,`www.perilous.dev`,`word.perilous.dev`,`mirror.perilous.dev`,`request.perilous.dev`,`the.chapel.perilous.dev`,`the.forest.perilous.dev`,`the.castle.perilous.dev`,`the.siege.perilous.dev`,`the.pass.perilous.dev`,`the.word.perilous.dev`,`the.mirror.perilous.dev`,`the.request.perilous.dev`,`the.adventure.perilous.dev`,`the.cs.perilous.dev`,`the.gallery.perilous.dev`,`gallery.perilous.dev`,`the.perilous.dev`,`ring.perilous.dev`,`the.ring.perilous.dev`,`autumn.perilous.dev`,`the.autumn.perilous.dev`)" - - "traefik.http.routers.perilous-secure.tls.certresolver=http" + environment: + - EMAIL_PASSWORD=${PERILOUS_CODE_SERVER_PASSWORD} networks: - web @@ -30,11 +27,6 @@ services: - PGID=1000 - PROXY_DOMAIN=cs.perilous.dev - DEFAULT_WORKSPACE=/home/project - labels: - - "traefik.enable=true" - - "traefik.http.routers.pcs-secure.entrypoints=https,http" - - "traefik.http.routers.pcs-secure.rule=Host(`cs.perilous.dev`)" - - "traefik.http.routers.pcs-secure.tls.certresolver=http" networks: - web diff --git a/stacks/traefik/conf.d/perilous.yml b/stacks/traefik/conf.d/perilous.yml index 629f5b5..5800dff 100644 --- a/stacks/traefik/conf.d/perilous.yml +++ b/stacks/traefik/conf.d/perilous.yml @@ -20,9 +20,9 @@ http: perilous: loadBalancer: servers: - - url: "http://192.168.5.34:3003" + - url: "http://perilous-web:3000" perilous-cs: loadBalancer: servers: - - url: "http://192.168.5.34:8180" + - url: "http://perilous-code-server:8443"