mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request +12468 from c9/fix-docker-deploy 

Fix docker deploy
pull/263/head
Fabian Jakobs 2016-02-26 13:29:50 +01:00
rodzic c794d27249 c957c933d7
commit a4a8c4bff9
2 zmienionych plików z 2 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
b9/lib/js/filter_node_modules.js
Wyświetl plik

@ -80,7 +80,7 @@ function calculateRequiredNodeModules(sourceDir, buildConfig, configNames, setti
var nodeModules = []; var nodeModules = [];
deps.forEach(function (dep) { deps.forEach(function (dep) {
if (dep.match(/node_modules/)) { if (dep.match(/node_modules/)) {
nodeModules.push(dep.replace(/node_modules\//, "")); nodeModules.push(dep.replace(/^(.*\/)?node_modules\//, ""));
} }
}); });
nodeModules.sort(); nodeModules.sort();

2
b9/lib/package_service_docker.sh
Wyświetl plik

@ -47,7 +47,7 @@ _b9_package_docker_node_modules() {
local NODE_MODULES local NODE_MODULES
local MODULE 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=$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') NODE_MODULES=$(cat $WORKDIR/package.json | jq -r '.dependencies | keys | @sh')