Compare commits

...

9 Commits

Author SHA1 Message Date
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
Conventional Changelog Action
57afc23fd7 chore 🤖: Release v1.2.3 [skip ci] 2025-10-26 16:28:50 +00:00
Josh Jacobs
ab60a1c20e chore: adjust Docker build workflow to conditionally push images 2025-10-26 16:24:01 +00:00
Josh Jacobs
e0c38935ba Merge branch 'main' of github.com:dangeroustech/ZeroTierBridge 2025-10-26 16:21:53 +00:00
Josh Jacobs
57390dc7c1 chore: standardize Dockerfile syntax for clarity 2025-10-26 16:19:28 +00:00
4 changed files with 22 additions and 12 deletions

View File

@@ -43,6 +43,7 @@ jobs:
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Login to Registry - name: Login to Registry
if: github.event_name != 'pull_request'
id: login id: login
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
@@ -56,8 +57,8 @@ jobs:
with: with:
context: . context: .
build-args: | build-args: |
VERSION=1.12.2 VERSION=1.16.0-2
push: true push: ${{ github.event_name != 'pull_request' }}
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
tags: ${{ env.REGISTRY_IMAGE }}:latest tags: ${{ env.REGISTRY_IMAGE }}:latest
cache-from: type=gha cache-from: type=gha

View File

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

View File

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

View File

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