Skip to content

Update to v6.7.0 with new versioning #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magna-z merged 1 commit into from
May 23, 2025
Merged

Update to v6.7.0 with new versioning #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/build-push.yml → .github/workflows/build-and-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ env:

on:
push:
branches:
- master
- v[0-9]+.[0-9]+
branches: ["v[0-9]+.[0-9]+.[0-9]+"]

defaults:
run:
Expand All @@ -17,7 +15,7 @@ defaults:
jobs:
docker-build-push:
name: Build and push docker images
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
matrix:
os: [alpine, debian, ubuntu]
Expand All @@ -33,23 +31,24 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set environment DOCKERHUB_IMAGE_TAGS on master
if: github.ref == 'refs/heads/master' && matrix.os == 'alpine'
run: echo "DOCKERHUB_IMAGE_TAGS=$DOCKERHUB_REPOSITORY:latest" >> $GITHUB_ENV
- name: Set environment DOCKERHUB_IMAGE_TAGS
if: github.ref != 'refs/heads/master'
run: |
_BRANCH=${GITHUB_REF##*/}
_VERSION=${_BRANCH#v*}
_MAJOR_VERSION=${_VERSION%.*}
_VERSION=${GITHUB_REF_NAME#v*}
_VERSION_MAJOR_MINOR=${_VERSION%.*}
_VERSION_MAJOR=${_VERSION_MAJOR_MINOR%.*}
_DOCKERHUB_IMAGE_TAGS="$DOCKERHUB_REPOSITORY:$_VERSION-${{ matrix.os }}"
_DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_MAJOR_VERSION-${{ matrix.os }}"
_DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_VERSION_MAJOR_MINOR-${{ matrix.os }}"
_DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_VERSION_MAJOR-${{ matrix.os }}"
_DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:${{ matrix.os }}"
if [ "${{ matrix.os }}" == "alpine" ]; then
_DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_VERSION"
_DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_MAJOR_VERSION"
_DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_VERSION_MAJOR_MINOR"
_DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:$_VERSION_MAJOR"
_DOCKERHUB_IMAGE_TAGS+=",$DOCKERHUB_REPOSITORY:latest"
fi
echo "DOCKERHUB_IMAGE_TAGS=$_DOCKERHUB_IMAGE_TAGS" >> $GITHUB_ENV
echo "VERSION=$_VERSION" >> $GITHUB_ENV
- name: Set environment DOCKERHUB_IMAGE_PLATFORMS
run: |
_DOCKERHUB_IMAGE_PLATFORMS="linux/amd64,linux/arm64"
Expand All @@ -63,5 +62,6 @@ jobs:
with:
file: Dockerfile.${{ matrix.os }}
tags: ${{ env.DOCKERHUB_IMAGE_TAGS }}
labels: org.opencontainers.image.version=${{ env.VERSION }}
platforms: ${{ env.DOCKERHUB_IMAGE_PLATFORMS }}
push: true
2 changes: 1 addition & 1 deletion Dockerfile.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.21

ENV TRACCAR_VERSION=6.6
ENV TRACCAR_VERSION=6.7.0

WORKDIR /opt/traccar

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:12-slim

ENV TRACCAR_VERSION=6.6
ENV TRACCAR_VERSION=6.7.0

WORKDIR /opt/traccar

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:24.04

ENV TRACCAR_VERSION=6.6
ENV TRACCAR_VERSION=6.7.0

WORKDIR /opt/traccar

Expand Down
15 changes: 9 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,19 @@ 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.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.X.X
- **6.7.0-alpine**, **6-alpine**, **alpine**, **6.7.0**, **6.7**, **6**, **latest** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.7.0-alpine)
- **6.7.0-debian**, **6-debian**, **6.7-debian**, **debian** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.7.0-debian)
- **6.7.0-ubuntu**, **6-ubuntu**, **6.7-ubuntu**, **ubuntu** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.7.0-ubuntu)
- **6.6-alpine**, **6.6** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.6-alpine)
- **6.6-debian** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.6-debian)
- **6.6-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
- **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.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 Down