diff options
| author | Philipp Prangenberg <philipp.prangenberg@derkurier.de> | 2016-12-05 12:03:08 +0100 |
|---|---|---|
| committer | Philipp Prangenberg <philipp.prangenberg@derkurier.de> | 2016-12-05 12:03:08 +0100 |
| commit | a21f436a58133f7da0cae06366d729665f3b8f9c (patch) | |
| tree | 72ff1743d96f79e4a9d85b0d48715e5f9aa67cf9 /setup/docker/build.sh | |
| parent | 960bf899414d89221e92138fdb98777c3f4f73ec (diff) | |
| parent | 40607036c5aa6385a7ae3f3a283bf107238a5944 (diff) | |
| download | trackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.tar.gz trackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.tar.bz2 trackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'setup/docker/build.sh')
| -rwxr-xr-x[-rw-r--r--] | setup/docker/build.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/setup/docker/build.sh b/setup/docker/build.sh index 31ee60a03..eedc633bc 100644..100755 --- a/setup/docker/build.sh +++ b/setup/docker/build.sh @@ -13,12 +13,18 @@ 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 '/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 -cp -rf ./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/ -rm -rf ${tmp}
\ No newline at end of file +rm -rf ${tmp} |