aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/DeployHelpers.py
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <tsuoanttila@users.noreply.github.com>2017-08-16 15:00:58 +0300
committerHenri Sara <henri.sara@gmail.com>2017-08-16 15:00:58 +0300
commit318fb10f6a4ad9cc1cd7f31f574fa4c50eec951e (patch)
tree38c7a8ac3671760f1396b9a2e5be0d7b6bc10531 /scripts/DeployHelpers.py
parent4cd7965fda54a124ea01066b5e9f6d9ee124ab1b (diff)
downloadvaadin-framework-318fb10f6a4ad9cc1cd7f31f574fa4c50eec951e.tar.gz
vaadin-framework-318fb10f6a4ad9cc1cd7f31f574fa4c50eec951e.zip
Build docker image for testing demos (#9826)
This patch allows the demo build script to wrap the resulting war files into docker image. The image contains a jetty with the provided war files deployed on start.
Diffstat (limited to 'scripts/DeployHelpers.py')
-rw-r--r--scripts/DeployHelpers.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/DeployHelpers.py b/scripts/DeployHelpers.py
index 038e187b8b..e8079c1df1 100644
--- a/scripts/DeployHelpers.py
+++ b/scripts/DeployHelpers.py
@@ -14,9 +14,13 @@ from os.path import join, expanduser, basename
from BuildHelpers import parser, getArgs
from time import sleep
-parser.add_argument("--deployUrl", help="Wildfly management URL")
-parser.add_argument("--deployUser", help="Deployment user", default=None)
-parser.add_argument("--deployPass", help="Deployment password", default=None)
+group = parser.add_mutually_exclusive_group(required=True)
+group.add_argument("--deploy", dest="deploy_mode", help="Deploy to a remote Wildfly instance", action="store_true")
+group.add_argument("--docker", dest="deploy_mode", help="Wrap results into a Docker image", action="store_false")
+
+parser.add_argument("--deployUrl", help="Wildfly management URL to use with --deploy")
+parser.add_argument("--deployUser", help="Deployment user to use with --deploy", default=None)
+parser.add_argument("--deployPass", help="Deployment password to use with --deploy", default=None)
serverUp = None
@@ -120,4 +124,4 @@ def getAuth():
# Read the deploy url file and return the url
def getUrl():
return getArgs().deployUrl
-
+