Improve docker compose structure

.env.development.example

@@ -1,7 +1,6 @@
 # More info here: https://docs.movary.org/configuration/
 
 # Environment
-ENV=development
 USER_ID=1000
 HTTP_PORT=80
 TIMEZONE="UTC"

.env.private

@@ -0,0 +1,44 @@
+# More info here: https://docs.movary.org/configuration/
+
+APPLICATION_URL="https://example.com/movary/"
+
+# Environment
+USER_ID=1000
+HTTP_PORT=80
+TIMEZONE="Europe/Berlin"
+MIN_RUNTIME_IN_SECONDS_FOR_JOB_PROCESSING=15
+ENABLE_REGISTRATION=0
+
+# Database
+DATABASE_MODE=sqlite
+DATABASE_SQLITE=storage/movary.sqlite
+DATABASE_MYSQL_HOST=mysql
+DATABASE_MYSQL_PORT=3306
+DATABASE_MYSQL_NAME=movary
+DATABASE_MYSQL_USER=movary
+DATABASE_MYSQL_PASSWORD=movary
+DATABASE_MYSQL_CHARSET=utf8mb4
+DATABASE_MYSQL_ROOT_PASSWORD=movary
+
+# Tmdb
+TMDB_API_KEY=f36ba35da852111a69f6149f326adbd2
+TMDB_ENABLE_IMAGE_CACHING=0
+
+# Plex
+#PLEX_IDENTIFIER=
+
+# Jellyfin
+#JELLYFIN_DEVICE_ID=
+
+# Logging
+LOG_LEVEL=debug
+LOG_ENABLE_STACKTRACE=1
+
+# Email
+#SMTP_HOST=
+#SMTP_PORT=
+#SMTP_SENDER_ADDRESS=
+#SMTP_ENCRYPTION=
+#SMTP_WITH_AUTH=
+#SMTP_USER=
+#SMTP_PASSWORD=

.env.production.example

@@ -1,38 +1,6 @@
 # More info here: https://docs.movary.org/configuration/
 
-# Environment
-ENV=production
 TIMEZONE="UTC"
-MIN_RUNTIME_IN_SECONDS_FOR_JOB_PROCESSING=15
 
-# Database
-DATABASE_MODE=sqlite
-DATABASE_SQLITE=storage/movary.sqlite
-DATABASE_MYSQL_HOST=
-DATABASE_MYSQL_PORT=
-DATABASE_MYSQL_NAME=
-DATABASE_MYSQL_USER=
-DATABASE_MYSQL_PASSWORD=
-DATABASE_MYSQL_CHARSET=utf8mb4
-
-# Tmdb
-TMDB_API_KEY=
+TMDB_API_KEY=f36ba35da852111a69f6149f326adbd2
 TMDB_ENABLE_IMAGE_CACHING=1
-
-# Plex
-#PLEX_IDENTIFIER=
-
-# Jellyfin
-#JELLYFIN_DEVICE_ID=
-
-# Logging
-LOG_LEVEL=warning
-
-# Email
-#SMTP_HOST=
-#SMTP_PORT=
-#SMTP_SENDER_ADDRESS=
-#SMTP_ENCRYPTION=
-#SMTP_WITH_AUTH=
-#SMTP_USER=
-#SMTP_PASSWORD=

docker-compose.development.yml

@@ -0,0 +1,15 @@
+version: "3.5"
+
+services:
+  app:
+    build:
+      context: ./
+      dockerfile: ./build/Dockerfile
+      target: development
+      args:
+        - USER_ID=${USER_ID:-1000}
+    volumes:
+      - ./:/app
+
+volumes:
+  movary-storage:

docker-compose.docs.yml

@@ -0,0 +1,7 @@
+services:
+  mkdocs:
+    image: squidfunk/mkdocs-material:latest
+    ports:
+      - "${HTTP_PORT_DOCS:-8000}:8000"
+    volumes:
+      - ./:/docs:ro

docker-compose.mysql.yml

@@ -0,0 +1,25 @@
+services:
+  mysql:
+    image: mysql:8.0
+    environment:
+      MYSQL_ROOT_PASSWORD: ${DATABASE_MYSQL_ROOT_PASSWORD:-movary}
+      MYSQL_USER: ${DATABASE_MYSQL_USER:-movary}
+      MYSQL_PASSWORD: ${DATABASE_MYSQL_PASSWORD:-movary}
+      MYSQL_DATABASE: ${DATABASE_MYSQL_NAME:-movary}
+      MYSQL_PORT: ${DATABASE_MYSQL_PORT:-3306}
+    volumes:
+      - movary-database:/var/lib/mysql
+    ports:
+      - "${DATABASE_MYSQL_PORT:-3306}:3306"
+
+  app:
+    environment:
+      DATABASE_MODE: "${DATABASE_MODE:-mysql}"
+      DATABASE_MYSQL_HOST: "${DATABASE_MYSQL_HOST:-mysql}"
+      DATABASE_MYSQL_NAME: "${DATABASE_MYSQL_NAME:-movary}"
+      DATABASE_MYSQL_USER: "${DATABASE_MYSQL_USER:-movary}"
+      DATABASE_MYSQL_PASSWORD: "${DATABASE_MYSQL_PASSWORD:-movary}"
+      DATABASE_MYSQL_PORT: "${DATABASE_MYSQL_PORT:-3306}"
+
+volumes:
+  movary-database:

docker-compose.overwrite.yml

@@ -0,0 +1,7 @@
+services:
+  app:
+    volumes:
+      - movary-storage:/app/storage
+
+volumes:
+  movary-storage:

docker-compose.yml

@@ -3,41 +3,14 @@ services:
     build:
       context: ./
       dockerfile: ./build/Dockerfile
-      target: development
+      target: production
       args:
-        - USER_ID=$USER_ID
+        - USER_ID=${USER_ID:-1000}
     ports:
-      - "${HTTP_PORT}:80"
-    volumes:
-      - ./:/app
-
-#  app_prod:
-#    build:
-#      context: ./
-#      dockerfile: build/Dockerfile
-#      target: production
-#    ports:
-#      - "8080:80"
-
-  mysql:
-    image: mysql:8.0
+      - "${HTTP_PORT:-80}:80"
     environment:
-      MYSQL_ROOT_PASSWORD: ${DATABASE_MYSQL_ROOT_PASSWORD}
-      MYSQL_USER: ${DATABASE_MYSQL_USER}
-      MYSQL_PASSWORD: ${DATABASE_MYSQL_PASSWORD}
-      MYSQL_DATABASE: ${DATABASE_MYSQL_NAME}
-    volumes:
-      - movary-database:/var/lib/mysql
-      - ./storage/:/tmp/host
-    ports:
-      - "${DATABASE_MYSQL_PORT}:3306"
-
-  mkdocs:
-    image: squidfunk/mkdocs-material:latest
-    ports:
-      - 8000:8000
-    volumes:
-      - ./:/docs:ro
+      TMDB_API_KEY: "${TMDB_API_KEY:-XXXXX}"
+      TMDB_ENABLE_IMAGE_CACHING: "${TMDB_ENABLE_IMAGE_CACHING:-0}"
 
 volumes:
-  movary-database:
+  movary-storage: