From 9585a063fd2027140987a7356a3a1bc06d51a317 Mon Sep 17 00:00:00 2001
From: Bento Silveira <bento@ninjazumbi.com>
Date: Sun, 23 Jul 2023 12:01:52 -0300
Subject: [PATCH] All environment settings moved to file

---
 configuration.env  |  7 +++++++
 docker-compose.yml | 15 ++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/configuration.env b/configuration.env
index 6b3e415..da3266a 100644
--- a/configuration.env
+++ b/configuration.env
@@ -44,3 +44,10 @@ hibernate.connection.driver_class="org.postgresql.Driver"
 hibernate.dialect="org.hibernate.dialect.PostgreSQLDialect"
 hibernate.connection.username="piped"
 hibernate.connection.password="changeme"
+
+###########################
+# Watchtower settings     #
+###########################
+
+WATCHTOWER_CLEANUP=true
+WATCHTOWER_INCLUDE_RESTARTING=true
diff --git a/docker-compose.yml b/docker-compose.yml
index be87ddb..40c1ba7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,8 +25,8 @@ services:
         restart: unless-stopped
         env_file:
             - configuration.env
-        volumes:
-            - ./config/config.properties:/app/config.properties:ro
+#        volumes:
+#            - ./config/config.properties:/app/config.properties:ro
         depends_on:
             - postgres
     nginx:
@@ -36,10 +36,8 @@ services:
         ports:
             - "80:80"
             - "443:443"
-        environment:
-            - FRONTEND_HOSTNAME=frontend-host.example.com
-            - BACKEND_HOSTNAME=backend-host.example.com
-            - PROXY_HOSTNAME=proxy-host.example.com
+        env_file:
+            - configuration.env
         volumes:
             - ./config/piped.conf.template:/etc/nginx/templates/piped.conf.template:ro
             - ./config/ytproxy.conf:/etc/nginx/snippets/ytproxy.conf:ro
@@ -69,9 +67,8 @@ services:
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
             - /etc/timezone:/etc/timezone:ro
-        environment:
-            - WATCHTOWER_CLEANUP=true
-            - WATCHTOWER_INCLUDE_RESTARTING=true
+        env_file:
+            - configuration.env
         command: piped-frontend piped-backend piped-proxy nginx postgres watchtower
 volumes:
     piped-proxy: null