wip #5590

diff --git a/updatecode b/updatecode
index fdd1a042c9242e06f313bb2b81dc20eaa71c1d4a..4201257dc51f5bb43deaface238c026c560af780 100755 (executable)
--- a/updatecode
+++ b/updatecode
@@ -1,6 +1,8 @@
 #!/bin/bash
 cd /docker/fluidbook-processfarm
 git config --global --add safe.directory /docker/fluidbook-processfarm
+git fetch --all
+git reset --hard origin/master
 git stash
 git pull origin master
 chmod 755 /docker/fluidbook-processfarm/app/bin/*

diff --git a/updatecode.bat b/updatecode.bat
index 787acb1b0411322748ca9ce12bd24eae05130bce..82a9430a5f1acfe87d76018f2487ba9f8c17132d 100644 (file)
--- a/updatecode.bat
+++ b/updatecode.bat
@@ -1,4 +1,4 @@
-ssh root@alien.cubedesigners.com "chmod 755 /docker/fluidbook-processfarm/updatecode;/docker/fluidbook-processfarm/updatecode"
+ssh root@alphaville.cubedesigners.com "chmod 755 /docker/fluidbook-processfarm/updatecode;/docker/fluidbook-processfarm/updatecode"
 ssh root@brazil.cubedesigners.com "chmod 755 /docker/fluidbook-processfarm/updatecode;/docker/fluidbook-processfarm/updatecode"
 ssh root@dracula.cubedesigners.com "chmod 755 /docker/fluidbook-processfarm/updatecode;/docker/fluidbook-processfarm/updatecode"
 ssh root@192.168.10.5 -p 22822 "chmod 755 /docker/fluidbook-processfarm/updatecode;/docker/fluidbook-processfarm/updatecode"