From 27880b836a25e1fc3bbb213bcab37f9afd43a955 Mon Sep 17 00:00:00 2001
From: xZero707 <aleksandar@puharic.com>
Date: Fri, 24 May 2024 00:38:57 +0200
Subject: [PATCH] Load secrets such as salts and db configuration from env
 files

---
 docker-compose.yml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fd30683..2bbf9b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,19 +3,7 @@ x-wordpress-configuration-env: &wordpress-configuration-env
   WORDPRESS_REDIS_HOST: redis
   WORDPRESS_CACHE: 1
   WORDPRESS_CACHE_KEY_SALT: 'Wp-'
-  WORDPRESS_DB_USER: wordpress
-  WORDPRESS_DB_NAME: wordpress
-  WORDPRESS_DB_HOST: database
-  WORDPRESS_DB_PASSWORD: ''
   WORDPRESS_TABLE_PREFIX: 'wp_'
-  WORDPRESS_AUTH_KEY: ''
-  WORDPRESS_SECURE_AUTH_KEY: ''
-  WORDPRESS_LOGGED_IN_KEY: ''
-  WORDPRESS_NONCE_KEY: ''
-  WORDPRESS_AUTH_SALT: ''
-  WORDPRESS_SECURE_AUTH_SALT: ''
-  WORDPRESS_LOGGED_IN_SALT: ''
-  WORDPRESS_NONCE_SALT: ''
   WORDPRESS_DEBUG: 0
   DEFAULT_EMAIL: "webmaster@example.com"
   WORDPRESS_CONFIG_EXTRA: |
@@ -48,6 +36,9 @@ services:
       interval: 30s
       timeout: 5s
       retries: 3
+    env_file:
+      - ./.secrets/wp-salts.env
+      - ./.secrets/wp-database.env
     environment:
       <<: [ *wordpress-configuration-env ]
       CRON_ENABLED: "false"