Merge branch 'master' of https://github.com/adamarthurryan/dubdiff
This commit is contained in:
commit
26f3a4d97f
0
docker/default-packages.sh
Normal file → Executable file
0
docker/default-packages.sh
Normal file → Executable file
0
docker/launch-devel.sh
Normal file → Executable file
0
docker/launch-devel.sh
Normal file → Executable file
2
docker/launch-production.sh
Normal file → Executable file
2
docker/launch-production.sh
Normal file → Executable file
@ -18,4 +18,4 @@ fi
|
||||
|
||||
echo Run this script from the project root folder!
|
||||
|
||||
docker run -it --rm -e "PORT=8080" --volumes-from=data-docker-home -v ${PWD}:/working -w /working -p 80:8080 adamarthurryan/mean grunt serve:dist
|
||||
docker run --restart=always -it -e "PORT=8080" --volumes-from=data-docker-home -v ${PWD}:/working -w /working -p 8081:8080 adamarthurryan/mean grunt serve:dist
|
||||
|
0
docker/prepare.sh
Normal file → Executable file
0
docker/prepare.sh
Normal file → Executable file
@ -43,7 +43,7 @@ module.exports = function(a, b, asMarkdown, callback) {
|
||||
if (err)
|
||||
return callback(err);
|
||||
|
||||
var cmd = "wdiff " + filea.path + " " +fileb.path;
|
||||
var cmd = "./bin/wdiff " + filea.path + " " +fileb.path;
|
||||
exec(cmd, function(err, stdout) {
|
||||
|
||||
if (err && err.code!=1 && err.code!=0) {
|
||||
|
Loading…
Reference in New Issue
Block a user