diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 76f0302a7..ad6d24325 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -17,19 +17,19 @@ defaults: jobs: docker-build-push: name: Build and push docker images - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: matrix: os: [alpine, debian, ubuntu] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -59,7 +59,7 @@ jobs: echo "DOCKERHUB_IMAGE_PLATFORMS=$_DOCKERHUB_IMAGE_PLATFORMS" >> $GITHUB_ENV - name: Build and push if: env.DOCKERHUB_IMAGE_TAGS != '' - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: file: Dockerfile.${{ matrix.os }} tags: ${{ env.DOCKERHUB_IMAGE_TAGS }} diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 35dc08189..fd47771a7 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,6 +1,6 @@ -FROM alpine:3.20 +FROM alpine:3.21 -ENV TRACCAR_VERSION 6.5 +ENV TRACCAR_VERSION=6.6 WORKDIR /opt/traccar diff --git a/Dockerfile.debian b/Dockerfile.debian index bc1f0dbca..a2e157694 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -1,6 +1,6 @@ FROM debian:12-slim -ENV TRACCAR_VERSION 6.5 +ENV TRACCAR_VERSION=6.6 WORKDIR /opt/traccar diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index a0ed292af..49e97c860 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,6 +1,6 @@ FROM ubuntu:24.04 -ENV TRACCAR_VERSION 6.5 +ENV TRACCAR_VERSION=6.6 WORKDIR /opt/traccar diff --git a/README.md b/README.md index 9d6c66c6b..1f2bb1253 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Maintainer: [Maxim Zalysin](https://github.com/magna-z) ## Available tags: #### 6.X -- **6.5-alpine**, **6-alpine**, **alpine**, **6.5**, **6**, **latest** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.5-alpine) -- **6.5-debian**, **6-debian**, **debian** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.5-debian) -- **6.5-ubuntu**, **6-ubuntu**, **ubuntu** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.5-ubuntu) +- **6.6-alpine**, **6-alpine**, **alpine**, **6.6**, **6**, **latest** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.6-alpine) +- **6.6-debian**, **6-debian**, **debian** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.6-debian) +- **6.6-ubuntu**, **6-ubuntu**, **ubuntu** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.6-ubuntu) - _..._ - _**6.0**, **6.0-alpine** / **6.0-debian** / **6.0-ubuntu**_ #### 5.X