Revert to mariaDB database instead linuxserver/mariadb

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
bensuperpc · Sep 16, 2024 · 8885463 · 8885463
1 parent 7d6d59a
commit 8885463
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -124,9 +124,9 @@ WORDPRESS_DB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
 For [wordpress_db.env](infrastructure/wordpress/env/wordpress_db.env) file, you need to change the password(s) and user for the database.
 
 ```sh
-MYSQL_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-MYSQL_USER=bensuperpc
-MYSQL_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
+MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
 ```
 
 For [wordpress_backup.env](infrastructure/wordpress/env/wordpress_backup.env) file, you need to change the password(s) for the restic backup.
@@ -137,9 +137,9 @@ RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
 For [adminer.env](infrastructure/wordpress/env/adminer.env) file, you need to change the password(s) and user for the database.
 
 ```sh
-MYSQL_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-MYSQL_USER=bensuperpc
-MYSQL_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
+MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
 ```
 
 For [gitea.env](infrastructure/gitea/env/gitea.env) file, you need to change the password(s) and user for the database.
@@ -153,9 +153,9 @@ GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
 For [gitea_db.env](infrastructure/gitea/env/gitea_db.env) file, you need to change the password(s) and user for the database.
 
 ```sh
-MYSQL_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
-MYSQL_USER=bensuperpc
-MYSQL_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
+MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
 ```
 
 For [psitransfer.env](infrastructure/psitransfer/env/psitransfer.env) file, you need to change the secret key.
@@ -173,9 +173,9 @@ SECRET_KEY=UZvg9nbcGIJlPEB3uI39TAEWyFOz9nm8
 For [projectsend_db.env](infrastructure/projectsend/env/projectsend_db.env) file, you need to change the password(s) and user for the database.
 
 ```sh
-MYSQL_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
-MYSQL_USER=bensuperpc
-MYSQL_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
+MARIADB_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
 ```
 
 For [picoshare.env](infrastructure/picoshare/env/picoshare.env) file, you need to change the secret key.

diff --git a/infrastructure/caddy/docker-compose.caddy.yml b/infrastructure/caddy/docker-compose.caddy.yml
@@ -5,7 +5,6 @@ services:
     container_name: caddy
     profiles:
       - caddy
-    #user: ${PUID:-1000}:${PGID:-1000} 
     depends_on:
       main_infrastructure:
         condition: service_completed_successfully
@@ -42,14 +41,12 @@ services:
       - caddy
     depends_on:
       - caddy
-    #user: "${PUID:-1000}:${PGID:-1000}"
     restart: on-failure:5
     env_file:
       - ./caddy/env/caddy_backup.env
     volumes:
       - caddy_backup:/mnt/restic
       - caddy_data:/data:ro
-    #  - caddy_backup_cache:/.cache
     networks:
       - infra-network
     security_opt:
@@ -62,6 +59,3 @@ volumes:
     name: caddy_config
   caddy_backup:
     name: caddy_backup
-  caddy_backup_cache:
-    name: caddy_backup_cache
-
diff --git a/infrastructure/gitea/docker-compose.gitea.yml b/infrastructure/gitea/docker-compose.gitea.yml
@@ -25,21 +25,19 @@ services:
 
   # Database gitea
   database_gitea:
-    image: lscr.io/linuxserver/mariadb:latest
+    image: mariadb:latest
     container_name: database_gitea
     profiles:
       - database
       - gitea
     depends_on:
       - caddy
-    environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
     restart: on-failure:5
     volumes:
       - gitea_db:/var/lib/mysql:rw
     env_file:
       - ./gitea/env/gitea_db.env
+    command: '--default-authentication-plugin=mysql_native_password'
     networks:
       - infra-network
     security_opt:

diff --git a/infrastructure/gitea/env/gitea_db.env b/infrastructure/gitea/env/gitea_db.env
@@ -1,4 +1,4 @@
-MYSQL_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
-MYSQL_USER=bensuperpc
-MYSQL_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-MYSQL_DATABASE=gitea
+MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
+MARIADB_DATABASE=gitea
diff --git a/infrastructure/main/docker-compose.main.yml b/infrastructure/main/docker-compose.main.yml
@@ -8,10 +8,6 @@ services:
       - infrastructure_server_chown:/infrastructure_server:rw
       - public_data:/infrastructure_server/public:rw
       - private_data:/infrastructure_server/private:rw
-      #- caddy_data:/infrastructure_server/caddy_data:rw
-      #- caddy_config:/infrastructure_server/caddy_config:rw
-      #- caddy_backup:/infrastructure_server/caddy_backup:rw
-      #- caddy_backup_cache:/infrastructure_server/caddy_backup_cache:rw
     read_only: true
     security_opt:
       - no-new-privileges:true
@@ -30,14 +26,6 @@ volumes:
     name: public_data
   private_data:
     name: private_data
-  caddy_data:
-    name: caddy_data
-  caddy_config:
-    name: caddy_config
-  caddy_backup:
-    name: caddy_backup
-  caddy_backup_cache:
-    name: caddy_backup_cache
 
 networks:
   infra-network:

diff --git a/infrastructure/projectsend/docker-compose.projectsend.yml b/infrastructure/projectsend/docker-compose.projectsend.yml
@@ -21,7 +21,7 @@ services:
 
   # Database projectsend
   projectsend_db:
-    image: lscr.io/linuxserver/mariadb:latest
+    image: mariadb:latest
     container_name: projectsend_db
     profiles:
       - database
@@ -33,9 +33,7 @@ services:
       - projectsend_db:/var/lib/mysql:rw
     env_file:
       - ./projectsend/env/projectsend_db.env
-    environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
+    command: '--default-authentication-plugin=mysql_native_password'
     networks:
       - infra-network
     security_opt:

diff --git a/infrastructure/projectsend/env/projectsend_db.env b/infrastructure/projectsend/env/projectsend_db.env
@@ -1,4 +1,4 @@
-MYSQL_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
-MYSQL_USER=bensuperpc
-MYSQL_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
-MYSQL_DATABASE=projectsend
+MARIADB_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
+MARIADB_DATABASE=projectsend
diff --git a/infrastructure/wordpress/docker-compose.wordpress.yml b/infrastructure/wordpress/docker-compose.wordpress.yml
@@ -21,21 +21,19 @@ services:
 
   # Database wordpress
   wordpress_db:
-    image: lscr.io/linuxserver/mariadb:latest
+    image: mariadb:latest
     container_name: wordpress_db
     profiles:
       - database
       - wordpress
     depends_on:
       - caddy
-    environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
     restart: on-failure:5
     volumes:
       - wordpress_db:/var/lib/mysql:rw
     env_file:
       - ./wordpress/env/wordpress_db.env
+    command: '--default-authentication-plugin=mysql_native_password'
     networks:
       - infra-network
     security_opt:

diff --git a/infrastructure/wordpress/env/adminer.env b/infrastructure/wordpress/env/adminer.env
@@ -1,4 +1,4 @@
-MYSQL_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-MYSQL_USER=bensuperpc
-MYSQL_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
+MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
 ADMINER_DEFAULT_SERVER=wordpress_db
diff --git a/infrastructure/wordpress/env/wordpress_db.env b/infrastructure/wordpress/env/wordpress_db.env
@@ -1,4 +1,4 @@
-MYSQL_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-MYSQL_USER=bensuperpc
-MYSQL_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
-MYSQL_DATABASE=wordpress
+MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
+MARIADB_DATABASE=wordpress