Docs - Deploy.

More deploy examples using docker-compose.

docs/deploy.md

@@ -15,7 +15,7 @@ SomniaRooms back-end and front-end can run on the same machine, but some config
 ### Deploy back-end and front-end on different servers (different ip address).
 If your servers have different IP addresses everything is a little bit easier. You can set-up subdomains for each one.
 
-Use the following docker compose files for back-end and front-end.
+Use the following docker compose files to deploy back-end and front-end on different servers.
 
 Back-end:
 ```yml
@@ -25,7 +25,8 @@ services:
     restart: unless-stopped
     environment:
       SERVER_NAME: https://api.somnia.dev # <-- Your hostname here!
-      DATABASE_URL: postgresql://somnia:ChangeMe!@database/somniarooms?serverVersion=16&ch>      MERCURE_PUBLISHER_JWT_KEY: ChangeThisMercureHubJWTSecretKey!
+      DATABASE_URL: postgresql://somnia:ChangeMe!@database/somniarooms?serverVersion=16&charset=utf8
+      MERCURE_PUBLISHER_JWT_KEY: ChangeThisMercureHubJWTSecretKey!
       MERCURE_SUBSCRIBER_JWT_KEY: ChangeThisMercureHubJWTSecretKey!
       APP_SECRET: ChangeMySecret
       FRANKENPHP_CONFIG: "" # <-- Dont touch this line unless you know what are doing.
@@ -95,7 +96,7 @@ services:
 
 
 ### Deploy on the same server.
-Right now, it's quite difficult to set back-end app on a port different from 80/443. Back-end uses Caddy as webserver and automatically try to get SSL certs from let's encrypt.
+Right now, it's quite difficult to set back-end app on a port different from 80/443. Back-end uses Caddy as webserver and automatically try to get SSL certs from let's encrypt. If back-end port is changed, back-end server address should be http to avoid failed TLS challenges.
 
 My go-to option will be using some reverse-proxy to redirect requests to back or front by domain name.
 
@@ -140,6 +141,8 @@ services:
       MERCURE_SUBSCRIBER_JWT_KEY: ChangeThisMercureHubJWTSecretKey!
       APP_SECRET: ChangeMySecret
       FRANKENPHP_CONFIG: "" # <-- Dont touch this line unless you know what are doing.
+      TRUSTED_HOSTS: api.somnia.dev
+      TRUSTED_PROXIES: reverse-proxy
     volumes:
       - caddy_data:/data
       - caddy_config:/config
@@ -152,6 +155,7 @@ services:
       - "traefik.http.routers.somniarooms-back.entrypoints=websecure"
       - "traefik.http.routers.somniarooms-back.tls=true"
       - "traefik.http.routers.somniarooms-back.tls.certresolver=lets-encrypt"
+      - "traefik.http.services.somniarooms-back.loadbalancer.server.port=80"
 
   somniarooms-front:
     image: gitea.uberelectronnetwork.cc/somnia/somniaroomsapp:devbuild
@@ -164,7 +168,10 @@ services:
       - somniarooms-back
     labels:
       - "traefik.http.routers.somniarooms-front.rule=Host(`app.somnia.dev`)" # <-- Your front-end hostname here!
-
+      - "traefik.http.routers.somniarooms-front.entrypoints=websecure"
+      - "traefik.http.routers.somniarooms-front.tls=true"
+      - "traefik.http.routers.somniarooms-front.tls.certresolver=lets-encrypt"
+      - "traefik.http.services.somniarooms-front.loadbalancer.server.port=80"
 
   database:
     image: postgres:16-alpine
@@ -189,6 +196,84 @@ volumes:
 
 ```
 
+If you dont care about SSL, you can set it up using HTTP only.
+You may need to use different ports for back-end and front-end.
+
+This setup uses the following config:
+- back-end -> port 8001.
+- front-end -> port 80.
+
+```yml
+services:
+  somniarooms-back:
+    image: gitea.uberelectronnetwork.cc/somnia/somniarooms:devbuild
+    restart: unless-stopped
+    environment:
+      # Server name should be "HTTP" to disable auto certs.
+      # Set listening port as well if different from 80/443.
+      # If a server name is set, Caddy will only work for that name. You can set all you need comma separated.
+      #   You can "wildcard" as well if that's your thing...
+      #     SERVER_NAME: :8001
+      SERVER_NAME: http://api.somnia.dev:8001, http://IP:8001
+      DATABASE_URL: postgresql://somnia:ChangeMe!@database/somniarooms?serverVersion=16&charset=utf8
+      MERCURE_PUBLISHER_JWT_KEY: ChangeThisMercureHubJWTSecretKey!
+      MERCURE_SUBSCRIBER_JWT_KEY: ChangeThisMercureHubJWTSecretKey!
+      FRANKENPHP_CONFIG: ""
+      APP_SECRET: ChangeMySecret
+      TRUSTED_HOSTS: api.somnia.dev
+    volumes:
+      - caddy_data:/data
+      - caddy_config:/config
+    ports:
+      # HTTP
+      # Target port must be the same as SERVER_NAME. Caddy will use SERVER_NAME port instead of 80/443 if set.
+      - target: 8001
+        published: 8001
+    depends_on:
+      - database
+
+  somniarooms-front:
+    image: gitea.uberelectronnetwork.cc/somnia/somniaroomsapp:devbuild
+    restart: unless-stopped
+    environment:
+      # You should set your public IP/hostname to back-end.
+      # You may have problems with CORS... Make sure back and front have same domain or allow requests for those domains.
+      SOMNIAROOMS_BACKEND_HOST: http://api.somnia.dev 
+      SOMNIAROOMS_BACKEND_PORT: 8001 # <-- Set back-end published port.
+    ports:
+      # HTTP
+      - target: 80
+        published: 80
+      # HTTPS.
+      # Uncomment if HTTPS is available. You should configure certs by yourself here.
+      #- target: 443
+      #  published: 443
+    depends_on:
+      - somniarooms-back
+
+  database:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_DB: somniarooms
+      # You should definitely change the password in production. Remember to change DATABASE_URL as well.
+      POSTGRES_PASSWORD: ChangeMe!
+      POSTGRES_USER: somnia
+    healthcheck:
+      test: ["CMD", "pg_isready"]
+      timeout: 5s
+      retries: 5
+      start_period: 60s
+    volumes:
+      - database_data:/var/lib/postgresql/data:rw
+      # You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
+      # - ./docker/db/data:/var/lib/postgresql/data:rw
+
+volumes:
+  caddy_data:
+  caddy_config:
+  database_data:
+```
+
 
 ## What's next?