Improved variable handling with a .env file

configuration.env

@@ -0,0 +1,46 @@
+###########################
+# Hostname settings       #
+###########################
+
+BACKEND_HOSTNAME=backend-host.example.com
+FRONTEND_HOSTNAME=frontend-host.example.com
+PROXY_HOSTNAME=proxy-host.example.com
+
+###########################
+# API container settings  #
+###########################
+
+# Port the server will listen on.
+PORT=8080
+
+# The number of workers to use for the server
+HTTP_WORKERS=2
+
+# URLs for the services. These need to be configured
+# on your DNS service
+FRONTEND_URL=https://frontend-host.example.com
+API_URL=https://backend-host.example.com
+PROXY_PART=https://proxy-host.example.com
+
+# Outgoing HTTP Proxy - eg: 127.0.0.1:8118
+#HTTP_PROXY=127.0.0.1:8118
+
+# Captcha Parameters
+CAPTCHA_BASE_URL=https://api.capmonster.cloud/
+CAPTCHA_API_KEY=INSERT_HERE
+
+# Enable haveibeenpwned compromised password API
+COMPROMISED_PASSWORD_CHECK=true
+
+# Disable Registration
+DISABLE_REGISTRATION=false
+
+# Feed Retention Time in Days
+FEED_RETENTION=30
+
+# Database settings
+hibernate.connection.url="jdbc:postgresql://postgres:5432/piped"
+hibernate.connection.driver_class="org.postgresql.Driver"
+hibernate.dialect="org.hibernate.dialect.PostgreSQLDialect"
+hibernate.connection.username="piped"
+hibernate.connection.password="changeme"

docker-compose.yml

@@ -7,8 +7,8 @@ services:
         restart: unless-stopped
         depends_on:
             - piped-backend
-        environment:
+        env_file:
-            - BACKEND_HOSTNAME=backend-host.example.com
+            - configuration.env
         volumes:
             - ./entrypoint.d/host_replace.envsh:/docker-entrypoint.d/99-host_replace.envsh
     piped-proxy:
@@ -23,10 +23,8 @@ services:
         image: 1337kavin/piped:latest
         container_name: piped-backend
         restart: unless-stopped
-        environment:
+        env_file:
-            - FRONTEND_URL=https://frontend-host.example.com
+            - configuration.env
-            - API_URL=https://backend-host.example.com
-            - PROXY_PART=https://proxy-host.example.com
         volumes:
             - ./config/config.properties:/app/config.properties:ro
         depends_on:
@@ -60,6 +58,8 @@ services:
         volumes:
             - ./data/db:/var/lib/postgresql/data
         environment:
+        # Database settings. Make sure to adjust these values
+        # on the configuration.env file too.
             - POSTGRES_DB=piped
             - POSTGRES_USER=piped
             - POSTGRES_PASSWORD=changeme