Compare commits

...

8 Commits

Author SHA1 Message Date
dependabot[bot]
6c40c0134f chore(deps): bump actions/checkout from 5 to 6
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-24 11:43:35 +00:00
Conventional Changelog Action
fd8043c501 chore 🤖: Release v1.2.4 [skip ci] 2025-10-26 17:37:00 +00:00
Josh Jacobs
5e6beb973b chore: enhance Docker build workflow with additional options
- Added provenance and sbom options set to false.
- Configured outputs for registry with specified compression settings.
2025-10-26 17:32:09 +00:00
Josh Jacobs
6666a5bc6c chore: set non-interactive mode for Docker builds
- Added ENV DEBIAN_FRONTEND=noninteractive to the Dockerfile to streamline the build process.
2025-10-26 17:00:22 +00:00
Josh Jacobs
d7b7ff961c chore: update Docker build workflow to version 1.16.0-2
- Updated the VERSION argument in the docker-build.yml file from 1.12.2 to 1.16.0-2.
2025-10-26 16:57:58 +00:00
Josh Jacobs
e02ffe1f36 chore: update Dockerfile to specify adduser version 2025-10-26 16:54:31 +00:00
Josh Jacobs
afd5d5e7ae chore: update Dockerfile to version 1.16.0-2
- Updated the VERSION argument from 1.12.2 to 1.16.0-2 for the ZeroTier package.
2025-10-26 16:50:31 +00:00
Josh Jacobs
86864780ec chore: update Dockerfile to use Debian 13.1 and update package versions
- Changed base image from Debian 12.6 to Debian 13.1.
- Updated package versions for ca-certificates, curl, procps, iptables, and openssl.
- Enhanced shell command syntax for improved error handling.
2025-10-26 16:40:11 +00:00
4 changed files with 25 additions and 13 deletions

View File

@@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -57,10 +57,13 @@ jobs:
with:
context: .
build-args: |
VERSION=1.12.2
VERSION=1.16.0-2
push: ${{ github.event_name != 'pull_request' }}
platforms: linux/amd64,linux/arm64
tags: ${{ env.REGISTRY_IMAGE }}:latest
provenance: false
sbom: false
outputs: type=registry,compression=zstd,compression-level=6,oci-mediatypes=true,force-compression=true
cache-from: type=gha
cache-to: type=gha,mode=max
@@ -105,7 +108,7 @@ jobs:
sarif_file: ${{ steps.scan.outputs.sarif }}
- name: Checkout Repository
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Changelog
uses: TriPSs/conventional-changelog-action@v6

View File

@@ -1,3 +1,7 @@
## [1.2.4](https://github.com/dangeroustech/ZeroTierBridge/compare/v1.2.3...v1.2.4) (2025-10-26)
## [1.2.3](https://github.com/dangeroustech/ZeroTierBridge/compare/v1.2.2...v1.2.3) (2025-10-26)

View File

@@ -1,10 +1,12 @@
FROM debian:12.6 AS stage
ARG PACKAGE_BASEURL=https://download.zerotier.com/debian/bookworm/pool/main/z/zerotier-one
FROM debian:13.1 AS stage
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ENV DEBIAN_FRONTEND=noninteractive
ARG PACKAGE_BASEURL=https://download.zerotier.com/debian/trixie/pool/main/z/zerotier-one
ARG TARGETARCH
ARG VERSION=1.12.2
ARG VERSION=1.16.0-2
RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y \
ca-certificates=20230311+deb12u1 \
curl=7.88.1-10+deb12u14
ca-certificates=20250419 \
curl=8.14.1-2
RUN set -e; \
DETECTED_ARCH="${TARGETARCH:-}"; \
if [ -z "$DETECTED_ARCH" ]; then DETECTED_ARCH="$(dpkg --print-architecture)"; fi; \
@@ -17,15 +19,18 @@ RUN set -e; \
echo "Downloading ZeroTier: arch=$ARCH_MAPPING version=$VERSION"; \
curl -fsSL -o zerotier-one.deb "${PACKAGE_BASEURL}/zerotier-one_${VERSION}_${ARCH_MAPPING}.deb"
FROM debian:12.6
FROM debian:13.1
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ENV DEBIAN_FRONTEND=noninteractive
ARG VERSION
RUN mkdir /app
WORKDIR /app
COPY --from=stage zerotier-one.deb .
RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y \
procps=2:4.0.2-3 \
iptables=1.8.9-2 \
openssl=3.0.17-1~deb12u3 \
adduser=3.152 \
procps=2:4.0.4-9 \
iptables=1.8.11-2 \
openssl=3.5.1-1 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN dpkg -i zerotier-one.deb && rm -f zerotier-one.deb

View File

@@ -1,3 +1,3 @@
{
"version": "1.2.3"
"version": "1.2.4"
}