Compare commits

..

1 Commits

5 changed files with 14 additions and 47 deletions

View File

@@ -1,11 +0,0 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly
open-pull-requests-limit: 10
labels:
- dependencies
- github-actions

View File

@@ -35,7 +35,7 @@ jobs:
version: [1.12.2] version: [1.12.2]
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v5 uses: actions/checkout@v4
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3
@@ -53,7 +53,7 @@ jobs:
- name: Build - name: Build
id: docker_build id: docker_build
uses: docker/build-push-action@v6 uses: docker/build-push-action@v5
with: with:
context: . context: .
build-args: | build-args: |
@@ -70,13 +70,12 @@ jobs:
touch "/tmp/digests/${digest#sha256:}" touch "/tmp/digests/${digest#sha256:}"
- name: Upload digest - name: Upload digest
uses: actions/upload-artifact@v5 uses: actions/upload-artifact@v3
with: with:
name: digests-${{ matrix.arch }} name: digests
path: /tmp/digests/* path: /tmp/digests/*
if-no-files-found: error if-no-files-found: error
retention-days: 1 retention-days: 1
overwrite: true
MergeRefs: MergeRefs:
name: Do The Horrible Merge Thing name: Do The Horrible Merge Thing
@@ -86,11 +85,10 @@ jobs:
- Docker_Build - Docker_Build
steps: steps:
- name: Download digests - name: Download digests
uses: actions/download-artifact@v6 uses: actions/download-artifact@v3
with: with:
pattern: digests-* name: digests
path: /tmp/digests path: /tmp/digests
merge-multiple: true
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
@@ -133,7 +131,7 @@ jobs:
output-file: ./sbom.spdx.json output-file: ./sbom.spdx.json
- name: Scan SBOM - name: Scan SBOM
uses: anchore/scan-action@v7 uses: anchore/scan-action@v3
id: scan id: scan
with: with:
sbom: sbom.spdx.json sbom: sbom.spdx.json
@@ -142,15 +140,15 @@ jobs:
only-fixed: true only-fixed: true
- name: upload Anchore scan SARIF report - name: upload Anchore scan SARIF report
uses: github/codeql-action/upload-sarif@v4 uses: github/codeql-action/upload-sarif@v2
with: with:
sarif_file: ${{ steps.scan.outputs.sarif }} sarif_file: ${{ steps.scan.outputs.sarif }}
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v5 uses: actions/checkout@v4
- name: Changelog - name: Changelog
uses: TriPSs/conventional-changelog-action@v6 uses: TriPSs/conventional-changelog-action@v3
id: changelog id: changelog
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
with: with:
@@ -163,7 +161,7 @@ jobs:
skip-on-empty: false # otherwise we don't publish fixes skip-on-empty: false # otherwise we don't publish fixes
- name: Create Release - name: Create Release
uses: softprops/action-gh-release@v2 uses: softprops/action-gh-release@v1
id: release id: release
if: ${{ steps.changelog.outputs.skipped == 'false' }} if: ${{ steps.changelog.outputs.skipped == 'false' }}
env: env:

View File

@@ -1,17 +1,3 @@
# [1.2.0](https://github.com/dangeroustech/ZeroTierBridge/compare/v1.1.2...v1.2.0) (2025-10-26)
### Bug Fixes
* **workflow:** update artifact naming and handling in docker-build.yml ([96ebbf8](https://github.com/dangeroustech/ZeroTierBridge/commit/96ebbf805d2cb3bb4089a5a0dc70114e3c16cc1b))
### Features
* **docker:** add health check to Dockerfile for zerotier-cli ([7d643e3](https://github.com/dangeroustech/ZeroTierBridge/commit/7d643e3ff6c0683d335baae5138ceef475cd37c3))
## [1.1.2](https://github.com/dangeroustech/ZeroTierBridge/compare/v1.1.1...v1.1.2) (2023-10-18) ## [1.1.2](https://github.com/dangeroustech/ZeroTierBridge/compare/v1.1.1...v1.1.2) (2023-10-18)

View File

@@ -2,24 +2,18 @@ FROM debian:12.6 as stage
ARG PACKAGE_BASEURL=https://download.zerotier.com/debian/bookworm/pool/main/z/zerotier-one ARG PACKAGE_BASEURL=https://download.zerotier.com/debian/bookworm/pool/main/z/zerotier-one
ARG ARCH=amd64 ARG ARCH=amd64
ARG VERSION=1.12.2 ARG VERSION=1.12.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 curl
ca-certificates=20230311+deb12u1 \
curl=7.88.1-10+deb12u14
RUN curl -sSL -o zerotier-one.deb "${PACKAGE_BASEURL}/zerotier-one_${VERSION}_${ARCH}.deb" RUN curl -sSL -o zerotier-one.deb "${PACKAGE_BASEURL}/zerotier-one_${VERSION}_${ARCH}.deb"
FROM debian:12.6 FROM debian:12.6
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 iptables openssl \
procps=2:4.0.2-3 \
iptables=1.8.9-2 \
openssl=3.0.17-1~deb12u3 \
&& 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
RUN echo "${VERSION}" >/etc/zerotier-version RUN echo "${VERSION}" >/etc/zerotier-version
COPY entrypoint.sh entrypoint.sh COPY entrypoint.sh entrypoint.sh
RUN chmod 755 entrypoint.sh RUN chmod 755 entrypoint.sh
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 CMD sh -c 'zerotier-cli info 2>/dev/null | grep -q ONLINE'
ENTRYPOINT ["/app/entrypoint.sh"] ENTRYPOINT ["/app/entrypoint.sh"]

View File

@@ -1,3 +1,3 @@
{ {
"version": "1.2.0" "version": "1.1.2"
} }