summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEthan Edwards <[email protected]>2020-07-23 07:49:41 -0400
committerGitHub <[email protected]>2020-07-23 07:49:41 -0400
commit3a88ff218ed998a00ff172df2c0a1bf734a22b0d (patch)
tree2f21891ef0f5d0c854bab132205ce2f60e082da4
parent8e4d8c0ed8dea12e1bf9a0aca003385006d3f731 (diff)
downloadcaprover-one-click-apps-3a88ff218ed998a00ff172df2c0a1bf734a22b0d.tar.gz
caprover-one-click-apps-3a88ff218ed998a00ff172df2c0a1bf734a22b0d.zip
added option to select database, mariadb or mysql (#233)
* added option to select database, mariadb or mysql * better naming convention * fix regex?
-rw-r--r--public/v2/apps/wordpress.json15
1 files changed, 11 insertions, 4 deletions
diff --git a/public/v2/apps/wordpress.json b/public/v2/apps/wordpress.json
index 76b2c7a..be237c3 100644
--- a/public/v2/apps/wordpress.json
+++ b/public/v2/apps/wordpress.json
@@ -7,7 +7,7 @@
"version": "3.3",
"services": {
"$$cap_appname-db": {
- "image": "mysql:$$cap_mysql_version",
+ "image": "$$cap_db_type:$$cap_database_version",
"notExposeAsWebApp": "true",
"volumes": ["$$cap_appname-db-data:/var/lib/mysql"],
"restart": "always",
@@ -59,10 +59,17 @@
"validRegex": "/^([^\\s^\\/])+$/"
},
{
- "id": "$$cap_mysql_version",
- "label": "MySQL Version",
+ "id": "$$cap_db_type",
+ "label": "Database Type",
+ "defaultValue": "mysql",
+ "description": "You can either choose mariadb or mysql, you need to change the version according to which DB is selected. It is case sensitive.",
+ "validRegex": "/^(mysql|mariadb)$/"
+ },
+ {
+ "id": "$$cap_database_version",
+ "label": "Database Version, default is MySQL",
"defaultValue": "5.7",
- "description": "Check out their Docker page for the valid tags https://hub.docker.com/r/library/mysql/tags/",
+ "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^\\/])+$/"
}
]