holm/zerotier-docker
1
1
Fork 0
forked from extern/zerotier-docker
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Lukas Prettenthaler 2022-06-12 20:32:25 +02:00
parent 4767514530
commit 6f866c1c0b
No known key found for this signature in database
GPG Key ID: 58E5A82932BCE65D
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/bridge.yml vendored
View File

@ -106,12 +106,12 @@ jobs:
- name: Create multi-arch manifest - name: Create multi-arch manifest
run: | run: |
buildah manifest create ${{ env.IMAGE_NAME }}:latest buildah manifest create ${{ env.IMAGE_NAME }}:latest
buildah manifest add --arch amd64 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:amd64 buildah manifest add --arch amd64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:amd64
buildah manifest add --arch 386 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:i386 buildah manifest add --arch 386 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:i386
buildah manifest add --arch arm64 --variant v8 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm64v8 buildah manifest add --arch arm64 --variant v8 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm64v8
buildah manifest add --arch arm --variant v7 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v7 buildah manifest add --arch arm --variant v7 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v7
buildah manifest add --arch arm --variant v6 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v6 buildah manifest add --arch arm --variant v6 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v6
buildah manifest add --arch riscv64 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:riscv64 buildah manifest add --arch riscv64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:riscv64
- name: Push unstable images - name: Push unstable images
if: ${{ inputs.event == 'push' }} if: ${{ inputs.event == 'push' }}

12
.github/workflows/multiarch.yml vendored
View File

@ -87,12 +87,12 @@ jobs:
- name: Create multi-arch manifest - name: Create multi-arch manifest
run: | run: |
buildah manifest create ${{ env.IMAGE_NAME }}:latest buildah manifest create ${{ env.IMAGE_NAME }}:latest
buildah manifest add --arch amd64 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:amd64 buildah manifest add --arch amd64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:amd64
buildah manifest add --arch 386 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:i386 buildah manifest add --arch 386 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:i386
buildah manifest add --arch arm64 --variant v8 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm64v8 buildah manifest add --arch arm64 --variant v8 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm64v8
buildah manifest add --arch arm --variant v7 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v7 buildah manifest add --arch arm --variant v7 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v7
buildah manifest add --arch arm --variant v6 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:arm32v6 buildah manifest add --arch arm --variant v6 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:arm32v6
buildah manifest add --arch riscv64 ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:riscv64 buildah manifest add --arch riscv64 ${{ env.IMAGE_NAME }}:latest localhost/${{ env.IMAGE_NAME }}:riscv64
- name: Push unstable images - name: Push unstable images
if: ${{ github.event_name == 'push' }} if: ${{ github.event_name == 'push' }}

10
Dockerfile.bridge
View File

@ -3,13 +3,19 @@ ARG FROM_VERSION=latest
FROM ${FROM_IMAGE}:${FROM_VERSION} FROM ${FROM_IMAGE}:${FROM_VERSION}
RUN apk add --no-cache --purge --clean-protected iptables \ LABEL org.opencontainers.image.title="zerotier" \
&& rm -rf /var/cache/apk/* org.opencontainers.image.version="bridge-${ZT_VERSION}" \
org.opencontainers.image.description="ZeroTier One as Docker Image" \
org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.source="https://github.com/zyclonite/zerotier-docker"
ENV LOG_PATH=/var/log/supervisor ENV LOG_PATH=/var/log/supervisor
COPY scripts/entrypoint-bridge.sh /usr/sbin/ COPY scripts/entrypoint-bridge.sh /usr/sbin/
RUN apk add --no-cache --purge --clean-protected iptables \
&& rm -rf /var/cache/apk/*
EXPOSE 9993/udp EXPOSE 9993/udp
ENTRYPOINT ["entrypoint-bridge.sh"] ENTRYPOINT ["entrypoint-bridge.sh"]