Skip to content

Commit

Permalink
Merge pull request #135 from traccar/v6.3
Browse files Browse the repository at this point in the history
v6.3 fix Java version
  • Loading branch information
magna-z authored Aug 2, 2024
2 parents 7650b9a + 0922fc3 commit 4c7fe67
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 21 deletions.
12 changes: 7 additions & 5 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ ENV TRACCAR_VERSION 6.3

WORKDIR /opt/traccar

RUN set -ex && \
apk add --no-cache --no-progress openjdk11-jre-headless wget && \
wget -qO /tmp/traccar.zip https://github.com/traccar/traccar/releases/download/v$TRACCAR_VERSION/traccar-other-$TRACCAR_VERSION.zip && \
unzip -qo /tmp/traccar.zip -d /opt/traccar && \
rm /tmp/traccar.zip && \
RUN set -ex; \
apk add --no-cache --no-progress \
openjdk17-jre-headless \
wget; \
wget -qO /tmp/traccar.zip https://github.com/traccar/traccar/releases/download/v$TRACCAR_VERSION/traccar-other-$TRACCAR_VERSION.zip; \
unzip -qo /tmp/traccar.zip -d /opt/traccar; \
rm /tmp/traccar.zip; \
apk del wget

ENTRYPOINT ["java", "-Xms1g", "-Xmx1g", "-Djava.net.preferIPv4Stack=true"]
Expand Down
19 changes: 11 additions & 8 deletions Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
FROM openjdk:11-jre-slim-bullseye
FROM debian:12.6-slim

ENV TRACCAR_VERSION 6.3

WORKDIR /opt/traccar

RUN set -ex && \
apt-get update &&\
TERM=xterm DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends unzip wget && \
wget -qO /tmp/traccar.zip https://github.com/traccar/traccar/releases/download/v$TRACCAR_VERSION/traccar-other-$TRACCAR_VERSION.zip && \
unzip -qo /tmp/traccar.zip -d /opt/traccar && \
apt-get autoremove --yes unzip wget && \
apt-get clean && \
RUN set -ex; \
apt-get update; \
TERM=xterm DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
openjdk-17-jre-headless \
unzip \
wget; \
wget -qO /tmp/traccar.zip https://github.com/traccar/traccar/releases/download/v$TRACCAR_VERSION/traccar-other-$TRACCAR_VERSION.zip; \
unzip -qo /tmp/traccar.zip -d /opt/traccar; \
apt-get autoremove --yes unzip wget; \
apt-get clean; \
rm -rf /var/lib/apt/lists/* /tmp/*

ENTRYPOINT ["java", "-Xms1g", "-Xmx1g", "-Djava.net.preferIPv4Stack=true"]
Expand Down
19 changes: 11 additions & 8 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
FROM adoptopenjdk:11-jre-hotspot-focal
FROM ubuntu:24.04

ENV TRACCAR_VERSION 6.3

WORKDIR /opt/traccar

RUN set -ex && \
apt-get update &&\
TERM=xterm DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends unzip wget && \
wget -qO /tmp/traccar.zip https://github.com/traccar/traccar/releases/download/v$TRACCAR_VERSION/traccar-other-$TRACCAR_VERSION.zip && \
unzip -qo /tmp/traccar.zip -d /opt/traccar && \
apt-get autoremove --yes unzip wget && \
apt-get clean && \
RUN set -ex; \
apt-get update; \
TERM=xterm DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
openjdk-17-jre-headless \
unzip \
wget; \
wget -qO /tmp/traccar.zip https://github.com/traccar/traccar/releases/download/v$TRACCAR_VERSION/traccar-other-$TRACCAR_VERSION.zip; \
unzip -qo /tmp/traccar.zip -d /opt/traccar; \
apt-get autoremove --yes unzip wget; \
apt-get clean; \
rm -rf /var/lib/apt/lists/* /tmp/*

ENTRYPOINT ["java", "-Xms1g", "-Xmx1g", "-Djava.net.preferIPv4Stack=true"]
Expand Down

0 comments on commit 4c7fe67

Please sign in to comment.