From 08e7edb1998cf3cb9a0be4e901d74367734695a6 Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Mon, 18 Dec 2023 09:36:07 +0800
Subject: [PATCH] drupal

---
 apps/dolibarr/.env           | 4 ++--
 apps/dolibarr/variables.json | 3 ++-
 apps/drupal/.env             | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/dolibarr/.env b/apps/dolibarr/.env
index 2399a7a5d..78949faa6 100644
--- a/apps/dolibarr/.env
+++ b/apps/dolibarr/.env
@@ -1,6 +1,6 @@
 W9_REPO=tuxgasy/dolibarr
 W9_DIST=community
-W9_VERSION=18.0.3
+W9_VERSION=18
 
 W9_POWER_PASSWORD=spJNF09yzwWJaG!
 
@@ -11,7 +11,7 @@ W9_HTTP_PORT=80
 W9_LOGIN_USER=admin
 W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
 W9_DB_EXPOSE="mariadb"
-W9_URL=internet_ip:$W9_HTTP_PORT_SET
+W9_URL=internet_ip
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####
diff --git a/apps/dolibarr/variables.json b/apps/dolibarr/variables.json
index 67febf2a5..adf5731a2 100644
--- a/apps/dolibarr/variables.json
+++ b/apps/dolibarr/variables.json
@@ -7,7 +7,8 @@
     {
       "dist": "community",
       "version": [
-        "18.0.1"
+        "18",
+        "latest"      
       ]
     }
   ],
diff --git a/apps/drupal/.env b/apps/drupal/.env
index f7794a32a..54118bd02 100644
--- a/apps/drupal/.env
+++ b/apps/drupal/.env
@@ -1,11 +1,10 @@
 W9_REPO=docker.io/bitnami/drupal
 W9_DIST=community
-W9_VERSION=10.1.6
+W9_VERSION=latest
 
 W9_POWER_PASSWORD=8dHZPFLFGoPXuC
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-
 W9_ID=drupal
 W9_HTTP_PORT=8080
 W9_HTTP_PORT_SET=9001
@@ -15,7 +14,7 @@ W9_ADMIN_PATH="/user/login"
 
 # Container name's suffix must use one of the value
 W9_DB_EXPOSE="mysql"
-W9_URL=internet_ip:$W9_HTTP_PORT_SET
+W9_URL=internet_ip
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####