From 689c875884b8c2b8a329f8bcffbaaa044d51da20 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Wed, 9 Oct 2024 16:33:30 +0200
Subject: [PATCH] fix vvveb

---
 ...th-mariadb.yml => vvveb-with-mariadb.yaml} | 27 ++++++++++---------
 .../{vvveb.yml => vvveb-with-mysql.yaml}      | 27 ++++++++++---------
 ...{vvveb-without-database.yml => vvveb.yaml} |  6 ++---
 3 files changed, 33 insertions(+), 27 deletions(-)
 rename templates/compose/{vvveb-with-mariadb.yml => vvveb-with-mariadb.yaml} (57%)
 rename templates/compose/{vvveb.yml => vvveb-with-mysql.yaml} (57%)
 rename templates/compose/{vvveb-without-database.yml => vvveb.yaml} (81%)

diff --git a/templates/compose/vvveb-with-mariadb.yml b/templates/compose/vvveb-with-mariadb.yaml
similarity index 57%
rename from templates/compose/vvveb-with-mariadb.yml
rename to templates/compose/vvveb-with-mariadb.yaml
index 7e1d663fa..a20c70a46 100644
--- a/templates/compose/vvveb-with-mariadb.yml
+++ b/templates/compose/vvveb-with-mariadb.yaml
@@ -2,35 +2,38 @@
 # slogan: Powerful and easy to use cms to build websites, blogs or ecommerce stores.
 # tags: cms, blog, content, management, ecommerce, page-builder, nocode, mysql, sqlite, pgsql
 # logo: svgs/vvveb.svg
+# port: 80
 
 services:
   vvveb:
     image: vvveb/vvvebcms:latest
     volumes:
-      - vvveb-files:/var/www/html
+      - vvveb-data:/var/www/html
     environment:
-      - SERVICE_FQDN_VVVEB
-      - DB_ENGINE=mysqli #sqlite,pgsql
+      - SERVICE_FQDN_VVVEB_80
+      - DB_ENGINE=mysqli
       - DB_HOST=mariadb
-      - DB_USER=$SERVICE_USER_VVVEB
-      - DB_PASSWORD=$SERVICE_PASSWORD_VVVEB
-      - DB_NAME=vvveb
+      - DB_USER=${SERVICE_USER_VVVEB}
+      - DB_PASSWORD=${SERVICE_PASSWORD_VVVEB}
+      - DB_NAME=${MARIADB_DATABASE:-vvveb}
     depends_on:
-      - mariadb
+      mariadb:
+        condition: service_healthy
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1"]
       interval: 2s
       timeout: 10s
       retries: 10
+
   mariadb:
     image: mariadb:11
     volumes:
-      - mariadb-data:/var/lib/mysql
+      - vvveb-mariadb-data:/var/lib/mysql
     environment:
-      - MYSQL_ROOT_PASSWORD=$SERVICE_PASSWORD_ROOT
-      - MYSQL_DATABASE=vvveb
-      - MYSQL_USER=$SERVICE_USER_VVVEB
-      - MYSQL_PASSWORD=$SERVICE_PASSWORD_VVVEB
+      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_ROOT}
+      - MYSQL_DATABASE=${MARIADB_DATABASE:-vvveb}
+      - MYSQL_USER=${SERVICE_USER_VVVEB}
+      - MYSQL_PASSWORD=${SERVICE_PASSWORD_VVVEB}
     healthcheck:
       test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
       interval: 5s
diff --git a/templates/compose/vvveb.yml b/templates/compose/vvveb-with-mysql.yaml
similarity index 57%
rename from templates/compose/vvveb.yml
rename to templates/compose/vvveb-with-mysql.yaml
index 43ec27c1a..64b4b264a 100644
--- a/templates/compose/vvveb.yml
+++ b/templates/compose/vvveb-with-mysql.yaml
@@ -2,35 +2,38 @@
 # slogan: Powerful and easy to use cms to build websites, blogs or ecommerce stores.
 # tags: cms, blog, content, management, ecommerce, page-builder, nocode, mysql, sqlite, pgsql
 # logo: svgs/vvveb.svg
+# port: 80
 
 services:
   vvveb:
     image: vvveb/vvvebcms:latest
     volumes:
-      - vvveb-files:/var/www/html
+      - vvveb-data:/var/www/html
     environment:
-      - SERVICE_FQDN_VVVEB
-      - DB_ENGINE=mysqli #sqlite,pgsql
+      - SERVICE_FQDN_VVVEB_80
+      - DB_ENGINE=mysqli
       - DB_HOST=mysql
-      - DB_USER=$SERVICE_USER_VVVEB
-      - DB_PASSWORD=$SERVICE_PASSWORD_VVVEB
-      - DB_NAME=vvveb
+      - DB_USER=${SERVICE_USER_VVVEB}
+      - DB_PASSWORD=${SERVICE_PASSWORD_VVVEB}
+      - DB_NAME=${MYSQL_DATABASE:-vvveb}
     depends_on:
-      - mysql
+      mysql:
+        condition: service_healthy
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1"]
       interval: 2s
       timeout: 10s
       retries: 10
+
   mysql:
     image: mysql:8.4.2
     volumes:
-      - mysql-data:/var/lib/mysql
+      - vvveb-mysql-data:/var/lib/mysql
     environment:
-      - MYSQL_ROOT_PASSWORD=$SERVICE_PASSWORD_ROOT
-      - MYSQL_DATABASE=vvveb
-      - MYSQL_USER=$SERVICE_USER_VVVEB
-      - MYSQL_PASSWORD=$SERVICE_PASSWORD_VVVEB
+      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_ROOT}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-vvveb}
+      - MYSQL_USER=${SERVICE_USER_VVVEB}
+      - MYSQL_PASSWORD=${SERVICE_PASSWORD_VVVEB}
     healthcheck:
       test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1"]
       interval: 5s
diff --git a/templates/compose/vvveb-without-database.yml b/templates/compose/vvveb.yaml
similarity index 81%
rename from templates/compose/vvveb-without-database.yml
rename to templates/compose/vvveb.yaml
index f1e92de63..11b71a7e9 100644
--- a/templates/compose/vvveb-without-database.yml
+++ b/templates/compose/vvveb.yaml
@@ -2,15 +2,15 @@
 # slogan: Powerful and easy to use cms to build websites, blogs or ecommerce stores.
 # tags: cms, blog, content, management, ecommerce, page-builder, nocode, mysql, sqlite, pgsql
 # logo: svgs/vvveb.svg
+# port: 80
 
 services:
   vvveb:
     image: vvveb/vvvebcms:latest
     volumes:
-      - vvveb-files:/var/www/html
+      - vvveb-data:/var/www/html
     environment:
-      - SERVICE_FQDN_VVVEB
-      - DB_ENGINE=sqlite #mysqli,pgsql
+      - SERVICE_FQDN_VVVEB_80
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1"]
       interval: 2s