From d14a36a939870c9062ec0df82d9828d448c36b77 Mon Sep 17 00:00:00 2001 From: Gabe Terrell Date: Fri, 22 Sep 2017 14:45:26 -0500 Subject: [PATCH 1/2] Update cli-config.yml --- app/templates/cli-config.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/app/templates/cli-config.yml b/app/templates/cli-config.yml index 7effa91..d56ca3d 100644 --- a/app/templates/cli-config.yml +++ b/app/templates/cli-config.yml @@ -1,34 +1,56 @@ +# The IBM version of this configuration version : 0.0.3 +# The container name used for the run container container-name-run : "<%= bluemix.name.toLowerCase() %>-express-run" +# The container name used for the tools container container-name-tools : "<%= bluemix.name.toLowerCase() %>-express-tools" +# The project root on the host for the run container to mount to container-path-run host-path-run : . +# The project root on the host for the tools container to mount to container-path-tools host-path-tools : . +# The project root in the run container to mount to host-path-run container-path-run : "/app" +# The project root in the tools container that will be mounted to host-path-tools container-path-tools : "/app" +# The list of additional mounts between the host and the run container in the form [host_path:container_path] container-mounts-run: - "./node_modules_linux": "/app/node_modules" +# The list of additional mounts between the host and the tools container in the form [host_path:container_path] container-mounts-tools: - "./node_modules_linux": "/app/node_modules" +# The port mappings between the host and the container in the form [host:container] container-port-map : "3000:3000" +# The port mappings between the host and the container for the debug port in the form [host:container] container-port-map-debug : "5858:5858" +# The name for the dockerfile for the run container dockerfile-run : "Dockerfile" +# The name for the dockerfile for the tools container dockerfile-tools : "Dockerfile-tools" +# The name of image to create from dockerfile-run image-name-run : "<%= bluemix.name.toLowerCase() %>-express-run" +# The name of image to create from dockerfile-tools image-name-tools : "<%= bluemix.name.toLowerCase() %>-express-tools" +# The command to build the code and docker image for RUN build-cmd-run : "npm install" +# The command to execute tests for the code in the tools container test-cmd : "npm run test" +# The command to build the code and docker image for DEBUG build-cmd-debug : "npm install" +# The command to run the code in the run container run-cmd : "" +# The command to execute debug of the code in the tools container debug-cmd : "npm run debug" +# The command to stop the code stop-cmd : "npm stop" +# The relative path to the helm chart used for Kubernetes deployment chart-path: "chart/<%= bluemix.name.toLowerCase()%>" From dfec19f7696d569fea91342c67c557f9358c9d7b Mon Sep 17 00:00:00 2001 From: Nana Amfo Date: Fri, 22 Sep 2017 19:57:41 +0000 Subject: [PATCH 2/2] [Travis - npm version patch] Increment package version to 0.0.55 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 681f519..24f2588 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "generator-ibm-core-node-express", - "version": "0.0.54", + "version": "0.0.55", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0a8f489..373804b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-ibm-core-node-express", - "version": "0.0.54", + "version": "0.0.55", "description": "Yeoman generator for core node express application", "license": "Apache-2.0", "keywords": [