mirror of
https://github.com/zyclonite/zerotier-docker.git
synced 2024-12-12 09:20:55 +01:00
rename "bridge" to "router"
1. Rename files with "bridge" in the name to "router". 2. Edit file contents referring to "bridge" so they refer to "router". 3. Update README to reflect this change, plus point to the relevant link in the ZeroTier documentation. Signed-off-by: Phill Kelley <34226495+Paraphraser@users.noreply.github.com>
This commit is contained in:
Phill Kelley
parent
a69a1b57ca
commit
ddb2636141
4
.github/workflows/multiarch.yml
vendored
4
.github/workflows/multiarch.yml
vendored
@ -103,8 +103,8 @@ jobs:
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:latest
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
|
||||
|
||||
bridge:
|
||||
uses: ./.github/workflows/bridge.yml
|
||||
router:
|
||||
uses: ./.github/workflows/router.yml
|
||||
needs: push
|
||||
with:
|
||||
tag: ${{ github.event.release.tag_name }}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
name: Bridge Mode build
|
||||
name: Router Mode build
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
@ -43,11 +43,11 @@ jobs:
|
||||
|
||||
- name: Build unstable image
|
||||
if: ${{ inputs.event == 'push' }}
|
||||
run: buildah bud --platform ${{ matrix.platform.name }} --build-arg FROM_IMAGE=${{ format('ghcr.io/zyclonite/{0}', env.IMAGE_NAME) }} --build-arg FROM_VERSION=main -f ./Dockerfile.bridge -t ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} .
|
||||
run: buildah bud --platform ${{ matrix.platform.name }} --build-arg FROM_IMAGE=${{ format('ghcr.io/zyclonite/{0}', env.IMAGE_NAME) }} --build-arg FROM_VERSION=main -f ./Dockerfile.router -t ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} .
|
||||
|
||||
- name: Build stable image
|
||||
if: ${{ inputs.event == 'release' }}
|
||||
run: buildah bud --platform ${{ matrix.platform.name }} --build-arg FROM_IMAGE=${{ format('ghcr.io/zyclonite/{0}', env.IMAGE_NAME) }} --build-arg FROM_VERSION=${{ inputs.tag }} -f ./Dockerfile.bridge -t ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} .
|
||||
run: buildah bud --platform ${{ matrix.platform.name }} --build-arg FROM_IMAGE=${{ format('ghcr.io/zyclonite/{0}', env.IMAGE_NAME) }} --build-arg FROM_VERSION=${{ inputs.tag }} -f ./Dockerfile.router -t ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} .
|
||||
|
||||
- name: Check images created
|
||||
run: buildah images | grep '${{ env.IMAGE_NAME }}'
|
||||
@ -98,16 +98,16 @@ jobs:
|
||||
- name: Push unstable images
|
||||
if: ${{ inputs.event == 'push' }}
|
||||
run: |
|
||||
buildah manifest push --all --format v2s2 --creds zyclonite:${{ secrets.REGISTRY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://docker.io/zyclonite/${{ env.IMAGE_NAME }}:bridge-main
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.QUAY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://quay.io/zyclonite/${{ env.IMAGE_NAME }}:bridge-main
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:bridge-main
|
||||
buildah manifest push --all --format v2s2 --creds zyclonite:${{ secrets.REGISTRY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://docker.io/zyclonite/${{ env.IMAGE_NAME }}:router-main
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.QUAY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://quay.io/zyclonite/${{ env.IMAGE_NAME }}:router-main
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:router-main
|
||||
|
||||
- name: Push stable images
|
||||
if: ${{ inputs.event == 'release' }}
|
||||
run: |
|
||||
buildah manifest push --all --format v2s2 --creds zyclonite:${{ secrets.REGISTRY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://docker.io/zyclonite/${{ env.IMAGE_NAME }}:bridge
|
||||
buildah manifest push --all --format v2s2 --creds zyclonite:${{ secrets.REGISTRY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://docker.io/zyclonite/${{ env.IMAGE_NAME }}:bridge-${{ github.event.release.tag_name }}
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.QUAY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://quay.io/zyclonite/${{ env.IMAGE_NAME }}:bridge
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.QUAY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://quay.io/zyclonite/${{ env.IMAGE_NAME }}:bridge-${{ github.event.release.tag_name }}
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:bridge
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:bridge-${{ github.event.release.tag_name }}
|
||||
buildah manifest push --all --format v2s2 --creds zyclonite:${{ secrets.REGISTRY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://docker.io/zyclonite/${{ env.IMAGE_NAME }}:router
|
||||
buildah manifest push --all --format v2s2 --creds zyclonite:${{ secrets.REGISTRY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://docker.io/zyclonite/${{ env.IMAGE_NAME }}:router-${{ github.event.release.tag_name }}
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.QUAY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://quay.io/zyclonite/${{ env.IMAGE_NAME }}:router
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.QUAY_PASSWORD }} ${{ env.IMAGE_NAME }}:latest docker://quay.io/zyclonite/${{ env.IMAGE_NAME }}:router-${{ github.event.release.tag_name }}
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:router
|
||||
buildah manifest push --all --creds zyclonite:${{ secrets.GITHUB_TOKEN }} ${{ env.IMAGE_NAME }}:latest docker://ghcr.io/zyclonite/${{ env.IMAGE_NAME }}:router-${{ github.event.release.tag_name }}
|
||||
@ -4,20 +4,20 @@ ARG FROM_VERSION=latest
|
||||
FROM ${FROM_IMAGE}:${FROM_VERSION}
|
||||
|
||||
LABEL org.opencontainers.image.title="zerotier" \
|
||||
org.opencontainers.image.version="bridge-${ZT_VERSION}" \
|
||||
org.opencontainers.image.description="ZeroTier One as Docker Image" \
|
||||
org.opencontainers.image.version="router-${ZT_VERSION}" \
|
||||
org.opencontainers.image.description="ZeroTier One router as Docker Image" \
|
||||
org.opencontainers.image.licenses="MIT" \
|
||||
org.opencontainers.image.source="https://github.com/zyclonite/zerotier-docker"
|
||||
|
||||
ENV LOG_PATH=/var/log/supervisor
|
||||
|
||||
COPY scripts/entrypoint-bridge.sh /usr/sbin/
|
||||
COPY scripts/entrypoint-router.sh /usr/sbin/
|
||||
|
||||
RUN apk add --no-cache --purge --clean-protected iptables \
|
||||
&& rm -rf /var/cache/apk/*
|
||||
|
||||
EXPOSE 9993/udp
|
||||
|
||||
ENTRYPOINT ["entrypoint-bridge.sh"]
|
||||
ENTRYPOINT ["entrypoint-router.sh"]
|
||||
|
||||
CMD ["-U"]
|
||||
@ -32,14 +32,14 @@ or create an empty file with the network as name
|
||||
|
||||
/var/lib/zerotier-one/networks.d/8056c2e21c000001.conf
|
||||
|
||||
#### Bridge mode
|
||||
It is the implementation of the local network bridge [paper](https://zerotier.atlassian.net/wiki/spaces/SD/pages/193134593/Bridge+your+ZeroTier+and+local+network+with+a+RaspberryPi)
|
||||
#### Router mode
|
||||
It is the implementation of the local network router [paper](https://zerotier.atlassian.net/wiki/spaces/SD/pages/224395274/Route+between+ZeroTier+and+Physical+Networks)
|
||||
|
||||
docker run --name zerotier-one --device=/dev/net/tun \
|
||||
--cap-add=NET_ADMIN --cap-add=NET_RAW --cap-add=SYS_ADMIN \
|
||||
-v /var/lib/zerotier-one:/var/lib/zerotier-one zyclonite/zerotier:bridge
|
||||
-v /var/lib/zerotier-one:/var/lib/zerotier-one zyclonite/zerotier:router
|
||||
|
||||
That will start the zero-one, establish connection and build the bridge once the `zt` interface is up.
|
||||
That will start the zero-one, establish connection and build the NAT+router once the `zt` interface is up.
|
||||
|
||||
#### Source
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ spec:
|
||||
|
||||
containers:
|
||||
- name: zerotier
|
||||
image: zyclonite/zerotier:bridge
|
||||
image: zyclonite/zerotier:router
|
||||
resources:
|
||||
limits:
|
||||
memory: "128Mi"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user