mirror of
https://github.com/dangeroustech/ZeroTierBridge.git
synced 2025-12-06 09:06:58 +00:00
Compare commits
1 Commits
v1.2.0
...
snyk-fix-f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ece47698e7 |
11
.github/dependabot.yml
vendored
11
.github/dependabot.yml
vendored
@@ -1,11 +0,0 @@
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: github-actions
|
||||
directory: /
|
||||
schedule:
|
||||
interval: weekly
|
||||
open-pull-requests-limit: 10
|
||||
labels:
|
||||
- dependencies
|
||||
- github-actions
|
||||
|
||||
24
.github/workflows/docker-build.yml
vendored
24
.github/workflows/docker-build.yml
vendored
@@ -35,7 +35,7 @@ jobs:
|
||||
version: [1.12.2]
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
@@ -53,7 +53,7 @@ jobs:
|
||||
|
||||
- name: Build
|
||||
id: docker_build
|
||||
uses: docker/build-push-action@v6
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
build-args: |
|
||||
@@ -70,13 +70,12 @@ jobs:
|
||||
touch "/tmp/digests/${digest#sha256:}"
|
||||
|
||||
- name: Upload digest
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: digests-${{ matrix.arch }}
|
||||
name: digests
|
||||
path: /tmp/digests/*
|
||||
if-no-files-found: error
|
||||
retention-days: 1
|
||||
overwrite: true
|
||||
|
||||
MergeRefs:
|
||||
name: Do The Horrible Merge Thing
|
||||
@@ -86,11 +85,10 @@ jobs:
|
||||
- Docker_Build
|
||||
steps:
|
||||
- name: Download digests
|
||||
uses: actions/download-artifact@v6
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
pattern: digests-*
|
||||
name: digests
|
||||
path: /tmp/digests
|
||||
merge-multiple: true
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
@@ -133,7 +131,7 @@ jobs:
|
||||
output-file: ./sbom.spdx.json
|
||||
|
||||
- name: Scan SBOM
|
||||
uses: anchore/scan-action@v7
|
||||
uses: anchore/scan-action@v3
|
||||
id: scan
|
||||
with:
|
||||
sbom: sbom.spdx.json
|
||||
@@ -142,15 +140,15 @@ jobs:
|
||||
only-fixed: true
|
||||
|
||||
- name: upload Anchore scan SARIF report
|
||||
uses: github/codeql-action/upload-sarif@v4
|
||||
uses: github/codeql-action/upload-sarif@v2
|
||||
with:
|
||||
sarif_file: ${{ steps.scan.outputs.sarif }}
|
||||
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Changelog
|
||||
uses: TriPSs/conventional-changelog-action@v6
|
||||
uses: TriPSs/conventional-changelog-action@v3
|
||||
id: changelog
|
||||
if: ${{ github.event_name != 'pull_request' }}
|
||||
with:
|
||||
@@ -163,7 +161,7 @@ jobs:
|
||||
skip-on-empty: false # otherwise we don't publish fixes
|
||||
|
||||
- name: Create Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
uses: softprops/action-gh-release@v1
|
||||
id: release
|
||||
if: ${{ steps.changelog.outputs.skipped == 'false' }}
|
||||
env:
|
||||
|
||||
14
CHANGELOG.md
14
CHANGELOG.md
@@ -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)
|
||||
|
||||
|
||||
|
||||
10
Dockerfile
10
Dockerfile
@@ -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 ARCH=amd64
|
||||
ARG VERSION=1.12.2
|
||||
RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y \
|
||||
ca-certificates=20230311+deb12u1 \
|
||||
curl=7.88.1-10+deb12u14
|
||||
RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y ca-certificates curl
|
||||
RUN curl -sSL -o zerotier-one.deb "${PACKAGE_BASEURL}/zerotier-one_${VERSION}_${ARCH}.deb"
|
||||
|
||||
FROM debian:12.6
|
||||
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 \
|
||||
RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y procps iptables openssl \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
RUN dpkg -i zerotier-one.deb && rm -f zerotier-one.deb
|
||||
RUN echo "${VERSION}" >/etc/zerotier-version
|
||||
COPY entrypoint.sh 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"]
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
"version": "1.2.0"
|
||||
"version": "1.1.2"
|
||||
}
|
||||
Reference in New Issue
Block a user