Merge pull request #75 from traccar/v4.13

Fix update to v4.13
pull/78/head
Maxim Zalysin 3 years ago committed by GitHub
commit 3199186c37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -53,8 +53,8 @@ jobs:
- name: Set environment DOCKERHUB_IMAGE_PLATFORMS - name: Set environment DOCKERHUB_IMAGE_PLATFORMS
run: | run: |
_DOCKERHUB_IMAGE_PLATFORMS="linux/amd64" _DOCKERHUB_IMAGE_PLATFORMS="linux/amd64"
if [ "${{ matrix.os }}" == "alpine" ]; then if [ "${{ matrix.os }}" == "debian" ]; then
_DOCKERHUB_IMAGE_PLATFORMS+=",linux/386,linux/arm/v6" _DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm64"
elif [ "${{ matrix.os }}" == "ubuntu" ]; then elif [ "${{ matrix.os }}" == "ubuntu" ]; then
_DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm/v7,linux/arm64" _DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm/v7,linux/arm64"
fi fi

@ -1,11 +1,11 @@
FROM openjdk:8-jre-alpine FROM alpine:3.13
ENV TRACCAR_VERSION 4.13 ENV TRACCAR_VERSION 4.13
WORKDIR /opt/traccar WORKDIR /opt/traccar
RUN set -ex && \ RUN set -ex && \
apk add --no-cache --no-progress wget && \ 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 && \ 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 && \ unzip -qo /tmp/traccar.zip -d /opt/traccar && \
rm /tmp/traccar.zip && \ rm /tmp/traccar.zip && \

@ -1,4 +1,4 @@
FROM openjdk:8-jre-slim FROM openjdk:11-jre-slim
ENV TRACCAR_VERSION 4.13 ENV TRACCAR_VERSION 4.13

@ -1,4 +1,4 @@
FROM adoptopenjdk:8-jre-hotspot-bionic FROM adoptopenjdk:11-jre-hotspot-focal
ENV TRACCAR_VERSION 4.13 ENV TRACCAR_VERSION 4.13

@ -30,8 +30,8 @@ Maintainer: [Maxim Zalysin](https://github.com/magna-z)
- **3.16-debian** - **3.16-debian**
## Available multi-platform images: ## Available multi-platform images:
**Alpine based**: linux/amd64, linux/386, linux/arm/v6 **Alpine based**: linux/amd64
**Debian based**: linux/amd64 **Debian based**: linux/amd64, linux/arm64/v8
**Ubuntu based**: linux/amd64, linux/arm/v7, linux/arm64/v8 **Ubuntu based**: linux/amd64, linux/arm/v7, linux/arm64/v8
## Container create example: ## Container create example:

Loading…
Cancel
Save