From 64eee3cdff0f913e11b66a42844f3f456f191d23 Mon Sep 17 00:00:00 2001 From: Jonathan Montesinos Date: Sun, 25 Nov 2018 20:44:49 -0500 Subject: [PATCH 1/3] wordpress 4.9 mysql requirements Minimum requirement updated for Wordpress 4.9. --- app-frontend/src/oneclick-apps/wordpress.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-frontend/src/oneclick-apps/wordpress.js b/app-frontend/src/oneclick-apps/wordpress.js index 1bf5be6..be0d33d 100644 --- a/app-frontend/src/oneclick-apps/wordpress.js +++ b/app-frontend/src/oneclick-apps/wordpress.js @@ -34,7 +34,7 @@ type: 'text' }); step1next.data.push({ - label: 'OPTIONAL: Docker Tag for MySQL (default "5.5")', + label: 'OPTIONAL: Docker Tag for MySQL (default "5.7")', labelDesc: 'https://hub.docker.com/r/library/mysql/tags/', id: DOCKER_TAG_MYSQL, type: 'text' @@ -83,7 +83,7 @@ } var dockerTagWordPress = data[DOCKER_TAG_WORDPRESS] || '4.9'; - var dockerTagMySql = data[DOCKER_TAG_MYSQL] || '5.5'; + var dockerTagMySql = data[DOCKER_TAG_MYSQL] || '5.7'; var mySqlAppName = data[WORDPRESS_NAME] + '-mysql'; var envVarsMySql = [{ key: MYSQL_ROOT_PASSWORD, @@ -231,4 +231,4 @@ } -})(); \ No newline at end of file +})(); From bc4b84b450a528ad9f34e1908a23e0409413ccd4 Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Mon, 26 Nov 2018 18:44:54 +0530 Subject: [PATCH 2/3] issue @283 fix --- app-backend/src/utils/GitHelper.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app-backend/src/utils/GitHelper.js b/app-backend/src/utils/GitHelper.js index 48602f4..de540c2 100644 --- a/app-backend/src/utils/GitHelper.js +++ b/app-backend/src/utils/GitHelper.js @@ -25,6 +25,8 @@ module.exports = { const USER = encodeURIComponent(username); const PASS = encodeURIComponent(pass); + + repo = repo.replace(/^(?:https?:\/\/)?/i, ''); const remote = `https://${USER}:${PASS}@${repo}`; @@ -49,4 +51,4 @@ module.exports = { }) } -}; \ No newline at end of file +}; From 17323b8570923730664a2546cfd887b5247f1766 Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Tue, 27 Nov 2018 01:50:43 +0530 Subject: [PATCH 3/3] url trimed --- app-backend/src/utils/GitHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-backend/src/utils/GitHelper.js b/app-backend/src/utils/GitHelper.js index de540c2..5adbc42 100644 --- a/app-backend/src/utils/GitHelper.js +++ b/app-backend/src/utils/GitHelper.js @@ -26,7 +26,7 @@ module.exports = { const USER = encodeURIComponent(username); const PASS = encodeURIComponent(pass); - repo = repo.replace(/^(?:https?:\/\/)?/i, ''); + repo = repo.trim().replace(/^(?:https?:\/\/)?/i, ''); const remote = `https://${USER}:${PASS}@${repo}`;