From 8940513e0e839b4571cba212dfa0fdc86e2451c9 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Fri, 26 Feb 2016 11:32:06 +0000 Subject: [PATCH 1/2] fix docker deploy --- b9/lib/js/filter_node_modules.js | 2 +- b9/lib/package_service_docker.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/b9/lib/js/filter_node_modules.js b/b9/lib/js/filter_node_modules.js index 69627b9c..b1f35718 100644 --- a/b9/lib/js/filter_node_modules.js +++ b/b9/lib/js/filter_node_modules.js @@ -80,7 +80,7 @@ function calculateRequiredNodeModules(sourceDir, buildConfig, configNames, setti var nodeModules = []; deps.forEach(function (dep) { if (dep.match(/node_modules/)) { - nodeModules.push(dep.replace(/node_modules\//, "")); + nodeModules.push(dep.replace(/^(.*\/)?node_modules\//, "")); } }); nodeModules.sort(); diff --git a/b9/lib/package_service_docker.sh b/b9/lib/package_service_docker.sh index cbe5d975..18e4c124 100644 --- a/b9/lib/package_service_docker.sh +++ b/b9/lib/package_service_docker.sh @@ -47,7 +47,7 @@ _b9_package_docker_node_modules() { local NODE_MODULES local MODULE - NODE_PATH=$B9_DIR/lib/js/node_modules $NODEJS $B9_DIR/lib/js/filter_node_modules.js docker --targetFile=$WORKDIR/package.json --source=$SOURCE --settings=$SETTINGS + NODE_PATH=$D9_DIR/node_modules $NODEJS $B9_DIR/lib/js/filter_node_modules.js docker --targetFile=$WORKDIR/package.json --source=$SOURCE --settings=$SETTINGS NODE_MODULES=$(cat $WORKDIR/package.json | jq -r '.dependencies | keys | @sh') From c957c933d7592826fc71f442eb43725d5993e4e8 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Fri, 26 Feb 2016 11:34:56 +0000 Subject: [PATCH 2/2] fix typo --- b9/lib/package_service_docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b9/lib/package_service_docker.sh b/b9/lib/package_service_docker.sh index 18e4c124..3b6afba1 100644 --- a/b9/lib/package_service_docker.sh +++ b/b9/lib/package_service_docker.sh @@ -47,7 +47,7 @@ _b9_package_docker_node_modules() { local NODE_MODULES local MODULE - NODE_PATH=$D9_DIR/node_modules $NODEJS $B9_DIR/lib/js/filter_node_modules.js docker --targetFile=$WORKDIR/package.json --source=$SOURCE --settings=$SETTINGS + NODE_PATH=$C9_DIR/node_modules:$NODE_PATH $NODEJS $B9_DIR/lib/js/filter_node_modules.js docker --targetFile=$WORKDIR/package.json --source=$SOURCE --settings=$SETTINGS NODE_MODULES=$(cat $WORKDIR/package.json | jq -r '.dependencies | keys | @sh')