From 6d9f03262f0c17b35651032bc2e5c9a81f4f0650 Mon Sep 17 00:00:00 2001
From: "S. Davis" <sdavis@nativeit.net>
Date: Mon, 8 Apr 2024 13:42:25 -0400
Subject: [PATCH] Bumped versions, removed redundant appname suffix

---
 public/v4/apps/wordpress-only.yml     | 6 +++---
 public/v4/apps/wordpress.yml          | 8 ++++----
 scripts/one-click-apps.code-workspace | 7 +++++++
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 scripts/one-click-apps.code-workspace

diff --git a/public/v4/apps/wordpress-only.yml b/public/v4/apps/wordpress-only.yml
index e34d9ea33..5ad2f2706 100644
--- a/public/v4/apps/wordpress-only.yml
+++ b/public/v4/apps/wordpress-only.yml
@@ -1,6 +1,6 @@
 captainVersion: 4
 services:
-    $$cap_appname-wordpress:
+    $$cap_appname:
         image: wordpress:$$cap_wp_version
         volumes:
             - $$cap_appname-wp-data:/var/www/html
@@ -35,7 +35,7 @@ caproverOneClickApp:
           defaultValue: $$cap_gen_random_hex(16)
         - id: $$cap_wp_version
           label: WordPress Version
-          defaultValue: 5.4.0
+          defaultValue: '6.5.0'
           description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/wordpress/tags/
           validRegex: /^([^\s^\/])+$/
     instructions:
@@ -46,7 +46,7 @@ caproverOneClickApp:
 
             Note: This app is intended for advanced users who'd like to have a central DB in a single container for multiple WP's. You should start by configuring your DB first and then comeback with all the DB Information.
         end: >-
-            Wordpress is deployed and available as $$cap_appname-wordpress . 
+            Wordpress is deployed and available as $$cap_appname . 
 
             IMPORTANT: It will take up to 2 minutes for WordPress to be ready. Before that, you might see a 502 error page.
 
diff --git a/public/v4/apps/wordpress.yml b/public/v4/apps/wordpress.yml
index 9bb35e596..67d51e4f1 100644
--- a/public/v4/apps/wordpress.yml
+++ b/public/v4/apps/wordpress.yml
@@ -12,7 +12,7 @@ services:
             MYSQL_PASSWORD: $$cap_db_pass
         caproverExtra:
             notExposeAsWebApp: 'true'
-    $$cap_appname-wordpress:
+    $$cap_appname:
         depends_on:
             - $$cap_appname-db
         image: wordpress:$$cap_wp_version
@@ -36,7 +36,7 @@ caproverOneClickApp:
           defaultValue: $$cap_gen_random_hex(16)
         - id: $$cap_wp_version
           label: WordPress Version
-          defaultValue: '6.0.1'
+          defaultValue: '6.5.0'          
           description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/wordpress/tags/
           validRegex: /^([^\s^\/])+$/
         - id: $$cap_db_type
@@ -46,7 +46,7 @@ caproverOneClickApp:
           validRegex: /^(mysql|mariadb)$/
         - id: $$cap_database_version
           label: Database Version, default is MySQL
-          defaultValue: '8.0.29'
+          defaultValue: '8.3.0'
           description: Check out the Docker pages for the valid tags https://hub.docker.com/r/library/mysql/tags/ or https://hub.docker.com/_/mariadb?tab=tags
           validRegex: /^([^\s^\/])+$/
     instructions:
@@ -55,7 +55,7 @@ caproverOneClickApp:
 
             Enter your WordPress Configuration parameters and click on next. A MySQL (database) and a WordPress container will be created for you. The process will take about a minute for the process to finish.
         end: >
-            Wordpress is deployed and available as $$cap_appname-wordpress . 
+            Wordpress is deployed and available as $$cap_appname . 
 
             IMPORTANT: It will take up to 2 minutes for WordPress to be ready. Before that, you might see a 502 error page.
     displayName: WordPress
diff --git a/scripts/one-click-apps.code-workspace b/scripts/one-click-apps.code-workspace
new file mode 100644
index 000000000..c45d029f0
--- /dev/null
+++ b/scripts/one-click-apps.code-workspace
@@ -0,0 +1,7 @@
+{
+  "folders": [
+    {
+      "path": ".."
+    }
+  ]
+}
\ No newline at end of file