From 89c2de3435ea720c65c51c1beea3ca4df7d40768 Mon Sep 17 00:00:00 2001
From: Miguel Cabral <migscabral@gmail.com>
Date: Wed, 19 Oct 2016 02:46:04 +0800
Subject: Fix current user for alpine in Dockerfile

---
 setup/docker/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'setup/docker/Dockerfile')

diff --git a/setup/docker/Dockerfile b/setup/docker/Dockerfile
index a39cad79c..40b650be1 100644
--- a/setup/docker/Dockerfile
+++ b/setup/docker/Dockerfile
@@ -2,6 +2,8 @@ FROM java:8-alpine
 
 MAINTAINER Danilo Recchia <danilo.recchia@vortus.solutions>
 
+USER root
+
 RUN apk upgrade --update && \
     apk add --update curl bash && \
     rm -rf /var/cache/apk/* && \
-- 
cgit v1.2.3


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

---
 README.md               | 19 +++++++++++++++++++
 setup/docker/Dockerfile |  3 ++-
 setup/docker/build.sh   |  7 ++++---
 3 files changed, 25 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 setup/docker/build.sh

(limited to 'setup/docker/Dockerfile')

diff --git a/README.md b/README.md
index 833314f69..6f2afc7a3 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,25 @@ Traccar is open source server for various GPS tracking devices. Project is writt
 
 Please read [build from source documentation](https://www.traccar.org/build/) on the official website.
 
+To build the Docker images first clone:
+
+$ git clone git@github.com:tananaev/traccar.git
+$ cd traccar
+
+Now init submodules:
+
+$ git submodule init
+$ git submodule update  
+
+Now you are able to build docker images:
+
+$ chmod 755 ./setup/docker/build.sh
+$ ./setup/docker/build.sh
+
+Running docker container based on this images:
+
+$ docker run --name traccar -ti tananaev/traccar:<TAG>
+
 ## Team
 
 - Anton Tananaev ([anton@traccar.org](mailto:anton@traccar.org))
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


From 6dc245d2082b7f0a4f440b817ce9c8455f441f93 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 25 Nov 2016 11:13:09 +1300
Subject: Add templates folder to docker

---
 setup/docker/Dockerfile | 1 +
 setup/docker/build.sh   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'setup/docker/Dockerfile')

diff --git a/setup/docker/Dockerfile b/setup/docker/Dockerfile
index 912ea4fd5..d86b078c1 100644
--- a/setup/docker/Dockerfile
+++ b/setup/docker/Dockerfile
@@ -15,6 +15,7 @@ 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/templates /opt/traccar/templates
 COPY ./tmp/web /opt/traccar/web
 COPY ./tmp/lib /opt/traccar/lib
 COPY ./tmp/traccar-server.jar /opt/traccar/traccar-server.jar
diff --git a/setup/docker/build.sh b/setup/docker/build.sh
index f32335ead..eedc633bc 100755
--- a/setup/docker/build.sh
+++ b/setup/docker/build.sh
@@ -16,6 +16,7 @@ mkdir -p ${tmp}
 cat ./setup/traccar.xml | awk '/config.default/ && !modif { print;printf("    <entry key=\"web.debug\">true</entry>\n");next; modif=1 } {print}'  > ${tmp}/traccar.xml
 cp -rf ./setup/default.xml ${tmp}
 cp -rf ./schema ${tmp}/schema
+cp -rf ./templates ${tmp}/templates
 cp -rf ./target/tracker-server.jar ${tmp}/traccar-server.jar
 cp -rf ./target/lib ${tmp}/lib
 if [ -d ./traccar-web/web ]; then
-- 
cgit v1.2.3