From e2ba4c0793489f40a48555c34fce32ad5e19db6b Mon Sep 17 00:00:00 2001 From: bvoudenaarde 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 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: + ## 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(" true\n"); modif=1 } {print}' > ${tmp}/traccar.xml +cat ./setup/traccar.xml | awk '/web.path/ && !modif { printf(" true\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 ed53b472c0cdea2d6f6ff71040f75c9f0869abfd Mon Sep 17 00:00:00 2001 From: bvoudenaarde Date: Mon, 21 Nov 2016 15:01:15 +0100 Subject: minnor change to README.md needed to expose ports, does not pick up EXPOSE ports from Dockerfile --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f2afc7a3..b9f4a91bf 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ $ ./setup/docker/build.sh Running docker container based on this images: -$ docker run --name traccar -ti tananaev/traccar: +$ docker run --name traccar -ti -p 8082:8082 -p 5000-5150:5000-5150 tananaev/traccar: ## Team -- cgit v1.2.3 From 0a2dfffa373ef8e72aa75cb56f0916bb424c37d6 Mon Sep 17 00:00:00 2001 From: bvoudenaarde Date: Wed, 23 Nov 2016 22:18:43 +0100 Subject: made changes build.sh conform review comments --- README.md | 2 +- setup/docker/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b9f4a91bf..376bb296a 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ $ ./setup/docker/build.sh Running docker container based on this images: -$ docker run --name traccar -ti -p 8082:8082 -p 5000-5150:5000-5150 tananaev/traccar: +$ docker run --name traccar -p 8082:8082 -p 5000-5150:5000-5150 tananaev/traccar: ## Team diff --git a/setup/docker/build.sh b/setup/docker/build.sh index 59280aaff..56d6fc518 100755 --- a/setup/docker/build.sh +++ b/setup/docker/build.sh @@ -13,7 +13,7 @@ tmp="./setup/docker/tmp" mkdir -p ${tmp} -cat ./setup/traccar.xml | awk '/web.path/ && !modif { printf(" true\n"); modif=1 } {print}' > ${tmp}/traccar.xml +cat ./setup/traccar.xml | awk '/config.default/ && !modif { print;printf(" true\n");next; 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 -- cgit v1.2.3 From ff4e575ecc79f0ccbb0a73d6b15c4415f7f8aece Mon Sep 17 00:00:00 2001 From: bvoudenaarde Date: Thu, 24 Nov 2016 20:14:07 +0100 Subject: improve web-less setup --- setup/docker/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup/docker/build.sh b/setup/docker/build.sh index 56d6fc518..f32335ead 100755 --- a/setup/docker/build.sh +++ b/setup/docker/build.sh @@ -18,7 +18,11 @@ 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 ./traccar-web/web ${tmp}/web +if [ -d ./traccar-web/web ]; then + cp -rf ./traccar-web/web ${tmp}/web +else + mkdir ${tmp}/web +fi docker build -t ${company}/${software}:${version} ./setup/docker/ -- cgit v1.2.3