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/Dockerfile | 3 ++-
 setup/docker/build.sh   | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 setup/docker/build.sh

(limited to 'setup/docker')

diff --git a/setup/docker/Dockerfile b/setup/docker/Dockerfile
index 40b650be1..912ea4fd5 100644
--- a/setup/docker/Dockerfile
+++ b/setup/docker/Dockerfile
@@ -13,6 +13,7 @@ RUN apk upgrade --update && \
 ENV JAVA_OPTS -Xms256m -Xmx1024m
 
 COPY ./tmp/traccar.xml /opt/traccar/traccar.xml
+COPY ./tmp/default.xml /opt/traccar/conf/default.xml
 COPY ./tmp/schema /opt/traccar/schema
 COPY ./tmp/web /opt/traccar/web
 COPY ./tmp/lib /opt/traccar/lib
@@ -23,4 +24,4 @@ EXPOSE 5000-5150
 
 WORKDIR /opt/traccar
 
-ENTRYPOINT ["java","-jar","traccar-server.jar","traccar.xml"]
\ No newline at end of file
+ENTRYPOINT ["java","-jar","traccar-server.jar","traccar.xml"]
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