chore: update auth and imgs services

jchenry · Feb 4, 2024 · a708dba · a708dba
1 parent 4fe315c
commit a708dba
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/docker-compose.prod-irc.yml b/docker-compose.prod-irc.yml
@@ -1,5 +1,25 @@
 version: "3.8"
 services:
+  auth-caddy:
+    image: ghcr.io/picosh/pico/caddy:latest
+    restart: always
+    networks:
+      - auth
+      - ${AUTH_NETWORK}
+    env_file:
+      - .env.prod
+    environment:
+      APP_DOMAIN: imgs.sh
+      APP_EMAIL: hello@pico.sh
+    volumes:
+      - ./caddy/Caddyfile.auth:/etc/caddy/Caddyfile
+      - ./data/auth-caddy/data:/data
+      - ./data/auth-caddy/config:/config
+    ports:
+      - "${AUTH_V4:-0.0.0.0}:443:443"
+      - "${AUTH_V4:-0.0.0.0}:80:80"
+      - "[${AUTH_V6:-::1}]:443:443"
+      - "[${AUTH_V6:-::1}]:80:80"
   auth-web:
     networks:
       - ${AUTH_NETWORK}
@@ -25,3 +45,10 @@ services:
       - ./data/bouncer:/app/db
       - ./data/certs:/certs
       - ${AUTH_REAL_CERT_MOUNT}
+networks:
+  auth:
+    driver_opts:
+      com.docker.network.bridge.name: auth
+    ipam:
+      config:
+        - subnet: 172.24.0.0/16
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -71,10 +71,6 @@ services:
   imgs-ssh:
     image: ghcr.io/picosh/pico/imgs-ssh:latest
     restart: always
-    profiles:
-      - imgs
-      - services
-      - all
   pgs-web:
     image: ghcr.io/picosh/pico/pgs-web:latest
     restart: always
@@ -111,7 +107,7 @@ services:
       - services
       - all
   bouncer:
-    image: ghcr.io/picosh/pico/bouncer:latest
+    image: ghcr.io/picosh/pico/bouncer:main
     restart: always
     profiles:
       - bouncer