From 6040b1a657f6767ccda4092ba2ed6631a312cc47 Mon Sep 17 00:00:00 2001 From: Maxim Zalysin Date: Fri, 4 Jun 2021 00:15:13 +0300 Subject: [PATCH 1/2] Fix update to v4.13 --- .github/workflows/build-push.yml | 4 +++- Dockerfile.alpine | 4 ++-- Dockerfile.debian | 2 +- Dockerfile.ubuntu | 2 +- README.md | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 07cd8fc..642b6e2 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -54,7 +54,9 @@ jobs: run: | _DOCKERHUB_IMAGE_PLATFORMS="linux/amd64" if [ "${{ matrix.os }}" == "alpine" ]; then - _DOCKERHUB_IMAGE_PLATFORMS+=",linux/386,linux/arm/v6" + _DOCKERHUB_IMAGE_PLATFORMS+=",linux/386" + elif [ "${{ matrix.os }}" == "debian" ]; then + _DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm64" elif [ "${{ matrix.os }}" == "ubuntu" ]; then _DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm/v7,linux/arm64" fi diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 862ba85..04389b4 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,11 +1,11 @@ -FROM openjdk:8-jre-alpine +FROM alpine:3.13 ENV TRACCAR_VERSION 4.13 WORKDIR /opt/traccar 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 && \ unzip -qo /tmp/traccar.zip -d /opt/traccar && \ rm /tmp/traccar.zip && \ diff --git a/Dockerfile.debian b/Dockerfile.debian index 08b7dda..8186361 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-slim +FROM openjdk:11-jre-slim ENV TRACCAR_VERSION 4.13 diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 166ea90..60638cf 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM adoptopenjdk:8-jre-hotspot-bionic +FROM adoptopenjdk:11-jre-hotspot-focal ENV TRACCAR_VERSION 4.13 diff --git a/README.md b/README.md index a7148c6..dfc8945 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ Maintainer: [Maxim Zalysin](https://github.com/magna-z) - **3.16-debian** ## Available multi-platform images: -**Alpine based**: linux/amd64, linux/386, linux/arm/v6 -**Debian based**: linux/amd64 +**Alpine based**: linux/amd64, linux/386 +**Debian based**: linux/amd64, linux/arm64/v8 **Ubuntu based**: linux/amd64, linux/arm/v7, linux/arm64/v8 ## Container create example: From 812ac8bd52557a93594bdcbb3ebbba4bca3cb103 Mon Sep 17 00:00:00 2001 From: Maxim Zalysin Date: Fri, 4 Jun 2021 00:21:01 +0300 Subject: [PATCH 2/2] Fix image platforms --- .github/workflows/build-push.yml | 4 +--- README.md | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 642b6e2..80661ef 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -53,9 +53,7 @@ jobs: - name: Set environment DOCKERHUB_IMAGE_PLATFORMS run: | _DOCKERHUB_IMAGE_PLATFORMS="linux/amd64" - if [ "${{ matrix.os }}" == "alpine" ]; then - _DOCKERHUB_IMAGE_PLATFORMS+=",linux/386" - elif [ "${{ matrix.os }}" == "debian" ]; then + if [ "${{ matrix.os }}" == "debian" ]; then _DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm64" elif [ "${{ matrix.os }}" == "ubuntu" ]; then _DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm/v7,linux/arm64" diff --git a/README.md b/README.md index dfc8945..8732ff5 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Maintainer: [Maxim Zalysin](https://github.com/magna-z) - **3.16-debian** ## Available multi-platform images: -**Alpine based**: linux/amd64, linux/386 +**Alpine based**: linux/amd64 **Debian based**: linux/amd64, linux/arm64/v8 **Ubuntu based**: linux/amd64, linux/arm/v7, linux/arm64/v8