From e2ba4c0793489f40a48555c34fce32ad5e19db6b Mon Sep 17 00:00:00 2001
From: bvoudenaarde <oudenaar@gmail.com>
Date: Mon, 21 Nov 2016 14:41:28 +0100
Subject: small fixes getting image build again

---
 setup/docker/build.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 setup/docker/build.sh

(limited to 'setup/docker/build.sh')

diff --git a/setup/docker/build.sh b/setup/docker/build.sh
old mode 100644
new mode 100755
index 31ee60a03..59280aaff
--- a/setup/docker/build.sh
+++ b/setup/docker/build.sh
@@ -13,12 +13,13 @@ tmp="./setup/docker/tmp"
 
 mkdir -p ${tmp}
 
-cat ./setup/unix/traccar.xml | awk '/web.path/ && !modif { printf("    <entry key=\"web.debug\">true</entry>\n"); modif=1 } {print}' > ${tmp}/traccar.xml
+cat ./setup/traccar.xml | awk '/web.path/ && !modif { printf("    <entry key=\"web.debug\">true</entry>\n"); modif=1 } {print}' > ${tmp}/traccar.xml
+cp -rf ./setup/default.xml ${tmp}
 cp -rf ./schema ${tmp}/schema
 cp -rf ./target/tracker-server.jar ${tmp}/traccar-server.jar
 cp -rf ./target/lib ${tmp}/lib
-cp -rf ./web ${tmp}/web
+cp -rf ./traccar-web/web ${tmp}/web
 
 docker build -t ${company}/${software}:${version} ./setup/docker/
 
-rm -rf ${tmp}
\ No newline at end of file
+rm -rf ${tmp}
-- 
cgit v1.2.3