Skip to content

Commit

Permalink
Update to v6.0 and update alpine image to v3.19.1 and add alpine arm6…
Browse files Browse the repository at this point in the history
…4 platform
  • Loading branch information
magna-z committed Apr 8, 2024
1 parent f1f955c commit 21f3204
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,9 @@ jobs:
echo "DOCKERHUB_IMAGE_TAGS=$_DOCKERHUB_IMAGE_TAGS" >> $GITHUB_ENV
- name: Set environment DOCKERHUB_IMAGE_PLATFORMS
run: |
_DOCKERHUB_IMAGE_PLATFORMS="linux/amd64"
if [ "${{ matrix.os }}" == "debian" ]; then
_DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm64"
elif [ "${{ matrix.os }}" == "ubuntu" ]; then
_DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm/v7,linux/arm64"
_DOCKERHUB_IMAGE_PLATFORMS="linux/amd64,linux/arm64"
if [ "${{ matrix.os }}" == "ubuntu" ]; then
_DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm/v7"
fi
echo "DOCKERHUB_IMAGE_PLATFORMS=$_DOCKERHUB_IMAGE_PLATFORMS" >> $GITHUB_ENV
- name: Build and push
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.18
FROM alpine:3.19.1

ENV TRACCAR_VERSION 5.12
ENV TRACCAR_VERSION 6.0

WORKDIR /opt/traccar

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:11-jre-slim-bullseye

ENV TRACCAR_VERSION 5.12
ENV TRACCAR_VERSION 6,0

WORKDIR /opt/traccar

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM adoptopenjdk:11-jre-hotspot-focal

ENV TRACCAR_VERSION 5.12
ENV TRACCAR_VERSION 6.0

WORKDIR /opt/traccar

Expand Down
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ DockerHub image: <https://hub.docker.com/r/traccar/traccar> ![](https://img.shie
Maintainer: [Maxim Zalysin](https://github.com/magna-z)

## Available tags:
#### 6.X
- **6.0-alpine**, **6-alpine**, **alpine**, **6.0**, **6**, **latest** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.0-alpine)
- **6.0-debian**, **6-debian**, **debian** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.0-debian)
- **6.0-ubuntu**, **6-ubuntu**, **ubuntu** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.0-ubuntu)
#### 5.X
- **5.12-alpine**, **5-alpine**, **alpine**, **5.12**, **5**, **latest** ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-alpine)
- **5.12-debian**, **5-debian**, **debian** ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-debian)
- **5.12-ubuntu**, **5-ubuntu**, **ubuntu** ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-ubuntu)
- **5.12-alpine**, **5-alpine**, **5.12**, **5** ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-alpine)
- **5.12-debian**, **5-debian**, ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-debian)
- **5.12-ubuntu**, **5-ubuntu**, ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-ubuntu)
- _..._
- _**5.0**, **5.0-alpine** / **5.0-debian** / **5.0-ubuntu**_
#### 4.X
Expand All @@ -23,9 +27,9 @@ Maintainer: [Maxim Zalysin](https://github.com/magna-z)
- _**3.16**, **3.16-alpine** / **3.16-debian**_

## Available multi-platform images:
**Alpine based**: linux/amd64
**Alpine based**: linux/amd64, linux/arm64
**Debian based**: linux/amd64, linux/arm64
**Ubuntu based**: linux/amd64, linux/arm/v7, linux/arm64
**Ubuntu based**: linux/amd64, linux/arm64, linux/arm/v7

## Container create example:
1. **Create work directories:**
Expand Down

0 comments on commit 21f3204

Please sign in to comment.