aboutsummaryrefslogtreecommitdiff
path: root/setup/docker/Dockerfile
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-11-25 11:11:22 +1300
committerGitHub <noreply@github.com>2016-11-25 11:11:22 +1300
commitd094946545b810fa82b2392d8e9dbe69d0ada891 (patch)
treefba2d2e7dcf2a7c23774a7d210d9b080ae5340a2 /setup/docker/Dockerfile
parent34645b739783b4aa2a13cd74516b5deec6597fe1 (diff)
parentff4e575ecc79f0ccbb0a73d6b15c4415f7f8aece (diff)
downloadtrackermap-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/docker/Dockerfile')
-rw-r--r--setup/docker/Dockerfile3
1 files changed, 2 insertions, 1 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"]