aboutsummaryrefslogtreecommitdiff
path: root/setup/docker/Dockerfile
diff options
context:
space:
mode:
authorPhilipp Prangenberg <philipp.prangenberg@derkurier.de>2016-12-05 12:03:08 +0100
committerPhilipp Prangenberg <philipp.prangenberg@derkurier.de>2016-12-05 12:03:08 +0100
commita21f436a58133f7da0cae06366d729665f3b8f9c (patch)
tree72ff1743d96f79e4a9d85b0d48715e5f9aa67cf9 /setup/docker/Dockerfile
parent960bf899414d89221e92138fdb98777c3f4f73ec (diff)
parent40607036c5aa6385a7ae3f3a283bf107238a5944 (diff)
downloadtrackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.tar.gz
trackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.tar.bz2
trackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'setup/docker/Dockerfile')
-rw-r--r--setup/docker/Dockerfile6
1 files changed, 5 insertions, 1 deletions
diff --git a/setup/docker/Dockerfile b/setup/docker/Dockerfile
index a39cad79c..d86b078c1 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/* && \
@@ -11,7 +13,9 @@ 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/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
@@ -21,4 +25,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"]