diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-25 11:11:22 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 11:11:22 +1300 |
| commit | d094946545b810fa82b2392d8e9dbe69d0ada891 (patch) | |
| tree | fba2d2e7dcf2a7c23774a7d210d9b080ae5340a2 /setup | |
| parent | 34645b739783b4aa2a13cd74516b5deec6597fe1 (diff) | |
| parent | ff4e575ecc79f0ccbb0a73d6b15c4415f7f8aece (diff) | |
| download | trackermap-server-d094946545b810fa82b2392d8e9dbe69d0ada891.tar.gz trackermap-server-d094946545b810fa82b2392d8e9dbe69d0ada891.tar.bz2 trackermap-server-d094946545b810fa82b2392d8e9dbe69d0ada891.zip | |
Merge pull request #2578 from oudenaar/master
Small fixes getting image build again
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/docker/Dockerfile | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | setup/docker/build.sh | 11 |
2 files changed, 10 insertions, 4 deletions
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 index 31ee60a03..f32335ead 100644..100755 --- a/setup/docker/build.sh +++ b/setup/docker/build.sh @@ -13,12 +13,17 @@ 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 ./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} |