remove some folders

.env.example

@@ -2,4 +2,5 @@ PLEX_CLAIM=
 DOMAIN=example.com
 UID=1000
 GID=1000
-TZ=Etc/UTC
+TZ=Etc/UTC
+DBPASS=

.gitignore

@@ -1,2 +1,4 @@
 .env
 config/
+nextcloud/
+nextcloud_bak/

docker-compose.yml

@@ -195,26 +195,41 @@ services:
     restart: unless-stopped
   wordpress-botc:
     depends_on:
-      - db-botc
+      db-botc:
+        condition: service_healthy
     image: wordpress
     restart: always
     ports:
       - 8089:80
     environment:
       WORDPRESS_DB_HOST: db-botc
-      WORDPRESS_DB_USER: exampleuser
-      WORDPRESS_DB_PASSWORD: examplepass
-      WORDPRESS_DB_NAME: exampledb
+      WORDPRESS_DB_USER: botc
+      WORDPRESS_DB_PASSWORD: ${DBPASS}
+      WORDPRESS_DB_NAME: botcdb
       VIRTUAL_HOST: "phillybotc.com, *.phillybotc.com"
     volumes:
       - wordpress-botc:/var/www/html
   db-botc:
     image: mysql:latest
+    healthcheck:
+      test:
+        [
+          "CMD",
+          'mysqladmin',
+          'ping',
+          '-h',
+          'localhost',
+          '-u',
+          '$$WORDPRESS_DB_USER',
+          '-p$$WORDPRESS_DB_PASSWORD'
+        ]
+      timeout: 20s
+      retries: 10
     restart: always
     environment:
-      MYSQL_DATABASE: exampledb
-      MYSQL_USER: exampleuser
-      MYSQL_PASSWORD: examplepass
+      MYSQL_DATABASE: botcdb
+      MYSQL_USER: botc
+      MYSQL_PASSWORD: ${DBPASS}
       MYSQL_RANDOM_ROOT_PASSWORD: '1'
     volumes:
       - db-botc:/var/lib/mysql
@@ -243,48 +258,8 @@ services:
       MYSQL_RANDOM_ROOT_PASSWORD: '1'
     volumes:
       - db-home:/var/lib/mysql
-  #Nextcloud
-  nc-db:
-    image: mariadb
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
-    restart: always
-    volumes:
-      - nc-db:/var/lib/mysql
-    env_file:
-      - ./nextcloud/db.env
-  nc-redis:
-    image: redis
-    restart: always
-  nc-app:
-    build: ./nextcloud/app
-    restart: always
-    ports:
-      - 5234:80
-    volumes:
-      - nextcloud:/var/www/html
-      - /media/storage/Cloud/Nextcloud:/storage
-    environment:
-      - NEXTCLOUD_DATA_DIR=/storage
-      - MYSQL_HOST=nc-db
-      - VIRTUAL_HOST=cloud.${DOMAIN}
-    env_file:
-      - ./nextcloud/db.env
-    depends_on:
-      - nc-db
-      - nc-redis
-  cron:
-    build: ./nextcloud/app
-    restart: always
-    volumes:
-      - nextcloud:/var/www/html
-    entrypoint: /cron.sh
-    depends_on:
-      - nc-db
-      - nc-redis
 
 volumes:
-  nc-db:
-  nextcloud:
   wordpress-home:
   db-home:
   wordpress-botc:

nextcloud/app/Dockerfile

@@ -1,15 +0,0 @@
-FROM nextcloud:apache
-
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
-
-ARG NEXTCLOUD_DATA_DIR="/storage/"
-
-RUN echo ${NEXTCLOUD_DATA_DIR}
-RUN mkdir -p ${NEXTCLOUD_DATA_DIR}; \
-	chown -R www-data:root ${NEXTCLOUD_DATA_DIR}; \
-	chmod -R g=u ${NEXTCLOUD_DATA_DIR}
-
-VOLUME ${NEXTCLOUD_DATA_DIR}
-
-#ENTRYPOINT ["/entrypoint.sh"]
-#CMD ["php-fpm"]

nextcloud/app/Dockerfile_simple

@@ -1,4 +0,0 @@
-FROM nextcloud:apache
- 
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
-

nextcloud/app/redis.config.php

@@ -1,10 +0,0 @@
-<?php
-$CONFIG = array (
-  'memcache.local' => '\\OC\\Memcache\\Redis',
-  'memcache.locking' => '\\OC\\Memcache\\Redis',
-  'filelocking.enabled' => 'true',
-  'redis' => array(
-    'host' => 'redis',
-    'port' => 6379,
-  ),
-);

nextcloud/db.env

@@ -1,4 +0,0 @@
-MYSQL_ROOT_PASSWORD=neurobomber
-MYSQL_PASSWORD=ncpass
-MYSQL_DATABASE=nextcloud
-MYSQL_USER=nextcloud