From 3f878a1e3da9a46e31cfc3bcfb2a037241a5e4ed Mon Sep 17 00:00:00 2001
From: "ckris.de admin" <admin@ckis.de>
Date: Sat, 30 May 2020 12:41:29 +0200
Subject: [PATCH] update auf neuste version und verwenden von secrets

---
 docker-compose.yml | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ea1db1a..1107f79 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,24 +9,26 @@ networks:
 
 services:
   mysql_nextcloud:
-    image: mariadb:10.3
+    image: mariadb:10
     container_name: mysql_nextcloud
     networks:
       - backend
     restart: unless-stopped
     volumes:
-      - ./_data_/db.mysql/config:/etc/mysql/conf.d 
       - ./_data_/db.mysql/db:/var/lib/mysql 
         # import an existing DB
         #- /home/titzi/db/nextcloud.sql:/docker-entrypoint-initdb.d/import.sql
     environment:
       MYSQL_USER: nextcloud
       MYSQL_DATABASE: nextcloud
-    env_file:
-      mysql.env
+      MYSQL_PASSWORD_FILE: /run/secrets/mysql_nextcloud_password
+      MYSQL_ROOT_PASSWORD_FILE: /run/secrets/mysql_root_password     
+    secrets:
+      - mysql_root_password
+      - mysql_nextcloud_password
 
   redis:
-    image: redis:5
+    image: redis:alpine
     container_name: redis
     networks:
       - backend
@@ -36,7 +38,7 @@ services:
     depends_on:
      - mysql_nextcloud
      - redis
-    image: nextcloud:18.0.0
+    image: nextcloud:18
     container_name: nextcloud
     networks:
       - webNet
@@ -48,17 +50,28 @@ services:
       - ./_data_/nextcloud/config:/var/www/html/config
       - ./_data_/nextcloud/data:/var/www/html/data
     environment:
+      REDIS_HOST: redis
+      MYSQL_HOST: mysql_nextcloud
       MYSQL_DATABASE: nextcloud
       MYSQL_USER: nextcloud
-      MYSQL_HOST: mysql_nextcloud
+      MYSQL_PASSWORD_FILE: /run/secrets/mysql_nextcloud_password
       NEXTCLOUD_TABLE_PREFIX: "oc_"
-      NEXTCLOUD_ADMIN_USER: mextcloud-admin
+      NEXTCLOUD_ADMIN_USER: nextcloud-admin
+      NEXTCLOUD_ADMIN_PASSWORD_FILE: /run/secrets/nextcloud_admin_password
       VIRTUAL_HOST: nextcloud.ckris.de
       LETSENCRYPT_HOST: nextcloud.ckris.de
       LETSENCRYPT_EMAIL: webmaster@ckris.de
-    env_file:
-      nextcloud.env
+    secrets:
+      - mysql_nextcloud_password
+      - nextcloud_admin_password
 
+secrets:
+  mysql_nextcloud_password:
+    file: ./secrets/mysql_nextcloud_password
+  mysql_root_password:
+    file: ./secrets/mysql_root_password
+  nextcloud_admin_password:
+    file: ./secrets/nextcloud_admin_password