mirror of
https://github.com/dangeroustech/ZeroTierBridge.git
synced 2025-12-06 09:06:58 +00:00
Compare commits
10 Commits
v1.0.13
...
46ee60cbc9
| Author | SHA1 | Date | |
|---|---|---|---|
| 46ee60cbc9 | |||
| bca9ec3df7 | |||
| 5cd683cb7a | |||
| 8d550748cd | |||
| f8d73263fd | |||
| 2c987a3bbe | |||
| be55349cef | |||
| 593036c8ad | |||
|
|
74c33dff3e | ||
| aab5c079dc |
78
.github/workflows/docker-build.yml
vendored
78
.github/workflows/docker-build.yml
vendored
@@ -6,9 +6,18 @@ on:
|
||||
branches:
|
||||
- "main"
|
||||
|
||||
env:
|
||||
REGISTRY_IMAGE: registry.dangerous.tech/dangeroustech/zerotierbridge
|
||||
|
||||
jobs:
|
||||
DockerBuildAndRelease:
|
||||
Docker_Build:
|
||||
name: "Docker Build And Release"
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: true
|
||||
matrix:
|
||||
arch: ["amd64", "arm64"]
|
||||
version: ["1.12.2"]
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
@@ -20,20 +29,81 @@ jobs:
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login to Registry
|
||||
id: registry_push
|
||||
id: login
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: registry.dangerous.tech
|
||||
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
|
||||
- name: Build and Push
|
||||
- name: Build
|
||||
id: docker_build
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
build-args: |
|
||||
ARCH=${{ matrix.arch }}
|
||||
VERSION=${{ matrix.version }}
|
||||
push: true
|
||||
tags: registry.dangerous.tech/dangeroustech/zerotierbridge:latest
|
||||
platforms: linux/${{ matrix.arch }}
|
||||
# tags: registry.dangerous.tech/dangeroustech/zerotierbridge:latest
|
||||
outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true
|
||||
|
||||
- name: Export Digests
|
||||
run: |
|
||||
mkdir -p /tmp/digests
|
||||
digest="${{ steps.docker_build.outputs.digest }}"
|
||||
touch "/tmp/digests/${digest#sha256:}"
|
||||
|
||||
- name: Upload digest
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: digests
|
||||
path: /tmp/digests/*
|
||||
if-no-files-found: error
|
||||
retention-days: 1
|
||||
|
||||
MergeRefs:
|
||||
name: "Do The Horrible Merge Thing"
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- Docker_Build
|
||||
steps:
|
||||
- name: Download digests
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: digests
|
||||
path: /tmp/digests
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login to Registry
|
||||
id: login
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: registry.dangerous.tech
|
||||
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
|
||||
- name: Docker meta
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY_IMAGE }}
|
||||
tags: |
|
||||
# set latest tag for default branch
|
||||
# https://github.com/docker/metadata-action#latest-tag
|
||||
type=raw,value=latest,enable={{is_default_branch}}
|
||||
|
||||
- name: Create manifest list and push
|
||||
working-directory: /tmp/digests
|
||||
run: |
|
||||
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
|
||||
$(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
|
||||
- name: Inspect image
|
||||
run: |
|
||||
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
|
||||
|
||||
- name: Generate SBOM
|
||||
uses: anchore/sbom-action@v0
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
# [1.1.0](https://github.com/dangeroustech/ZeroTierBridge/compare/v1.0.13...v1.1.0) (2023-09-23)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* multi-platform builds ([aab5c07](https://github.com/dangeroustech/ZeroTierBridge/commit/aab5c079dcd559b7c3123aa72d02f7691827083e))
|
||||
|
||||
|
||||
|
||||
## [1.0.13](https://github.com/dangeroustech/ZeroTierBridge/compare/v1.0.12...v1.0.13) (2023-09-22)
|
||||
|
||||
|
||||
|
||||
@@ -42,14 +42,10 @@ Disable bridging by passing `ZT_BRIDGE=false`. This can be done after the initia
|
||||
|
||||
If you would like the container to retain the same ZeroTier client ID on reboot, attach a volume as per the below.
|
||||
|
||||
`docker run --privileged -e ZT_NETWORKS=NETWORK_ID_HERE ZT_BRIDGE=true --volume zt1:/var/lib/zerotier-one/ zerotierbridge:latest`
|
||||
`docker run --privileged -e ZT_NETWORKS=NETWORK_ID_HERE ZT_BRIDGE=true --volume zt_config:/var/lib/zerotier-one/ zerotierbridge:latest`
|
||||
|
||||
#### Caveat: Architecture
|
||||
|
||||
If you need to run this on a device with different architecture (a raspberry pi, for instance), then just edit line 3 of the Dockerfile.
|
||||
|
||||
If you were using a Raspberry Pi 4, you would change this to `ARCH=arm64` and the container will pull the correct ZeroTier installer.
|
||||
|
||||
## TODO
|
||||
|
||||
- Add kubernetes deployment YAML
|
||||
|
||||
@@ -3,12 +3,7 @@ version: "3"
|
||||
services:
|
||||
zerotierbridge:
|
||||
container_name: zerotierbridge
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
ARCH: amd64
|
||||
VERSION: 1.12.2
|
||||
image: registry.dangerous.tech/dangeroustech/zerotierbridge
|
||||
restart: always
|
||||
privileged: true
|
||||
volumes:
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
"version": "1.0.13"
|
||||
"version": "1.1.0"
|
||||
}
|
||||
5064
sbom.spdx.json
5064
sbom.spdx.json
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user