mirrors/ZeroTierOne
1
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-12-05 18:20:32 -08:00
Code Issues Projects Releases Wiki Activity

set --provenance false on docker build to try and fix docker image creation issue

Browse source
This commit is contained in:
Grant Limberg 2025-11-12 16:17:03 -08:00
parent 50daf9537b
commit 2ba50f4544
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
1 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

112
.github/workflows/central-controller.yaml vendored
View file

@ -12,71 +12,71 @@ jobs:
runner: [gha-runner-x64, gha-runner-arm64] runner: [gha-runner-x64, gha-runner-arm64]
runs-on: ${{ matrix.runner }} runs-on: ${{ matrix.runner }}
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: GCP Auth
uses: google-github-actions/auth@v2
with:
credentials_json: ${{ secrets.DOCKER_REGISTRY_WRITER}}
- name: Set up GCloud CLI
uses: google-github-actions/setup-gcloud@v2
- name: Docker Auth - name: GCP Auth
run: gcloud auth configure-docker us-central1-docker.pkg.dev --quiet uses: google-github-actions/auth@v2
with:
credentials_json: ${{ secrets.DOCKER_REGISTRY_WRITER}}
- name: Get branch name and sanitize - name: Set up GCloud CLI
id: branch uses: google-github-actions/setup-gcloud@v2
run: |
BRANCH_NAME="${GITHUB_REF##*/}" - name: Docker Auth
SANITIZED_BRANCH="${BRANCH_NAME//\//-}" run: gcloud auth configure-docker us-central1-docker.pkg.dev --quiet
echo "branch_name=$SANITIZED_BRANCH" >> $GITHUB_OUTPUT
- name: Get branch name and sanitize
- name: Get short git commit SHA id: branch
id: sha run: |
run: | BRANCH_NAME="${GITHUB_REF##*/}"
calculatedSha=$(git rev-parse --short ${{ github.sha }}) SANITIZED_BRANCH="${BRANCH_NAME//\//-}"
echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV echo "branch_name=$SANITIZED_BRANCH" >> $GITHUB_OUTPUT
- name: Get short git commit SHA
id: sha
run: |
calculatedSha=$(git rev-parse --short ${{ github.sha }})
echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV
- name: Build & Push Docker Image
run: |
docker build -t us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }}-${{ runner.arch }} -f ext/central-controller-docker/Dockerfile.new --provenance false . --push
- name: Build & Push Docker Image
run: |
docker build -t us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }}-${{ runner.arch }} -f ext/central-controller-docker/Dockerfile.new . --push
multi-arch-docker: multi-arch-docker:
runs-on: gha-runner-x64 runs-on: gha-runner-x64
needs: central_controller needs: central_controller
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: GCP Auth - name: GCP Auth
uses: google-github-actions/auth@v2 uses: google-github-actions/auth@v2
with: with:
credentials_json: ${{ secrets.DOCKER_REGISTRY_WRITER}} credentials_json: ${{ secrets.DOCKER_REGISTRY_WRITER}}
- name: Set up GCloud CLI - name: Set up GCloud CLI
uses: google-github-actions/setup-gcloud@v2 uses: google-github-actions/setup-gcloud@v2
- name: Docker Auth - name: Docker Auth
run: gcloud auth configure-docker us-central1-docker.pkg.dev --quiet run: gcloud auth configure-docker us-central1-docker.pkg.dev --quiet
- name: Get branch name and sanitize - name: Get branch name and sanitize
id: branch id: branch
run: | run: |
BRANCH_NAME="${GITHUB_REF##*/}" BRANCH_NAME="${GITHUB_REF##*/}"
SANITIZED_BRANCH="${BRANCH_NAME//\//-}" SANITIZED_BRANCH="${BRANCH_NAME//\//-}"
echo "branch_name=$SANITIZED_BRANCH" >> $GITHUB_OUTPUT echo "branch_name=$SANITIZED_BRANCH" >> $GITHUB_OUTPUT
- name: Get short git commit SHA
id: sha
run: |
calculatedSha=$(git rev-parse --short ${{ github.sha }})
echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV
- name: Create and push multi-arch manifest - name: Get short git commit SHA
run: | id: sha
docker manifest create us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }} \ run: |
--amend us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }}-X64 \ calculatedSha=$(git rev-parse --short ${{ github.sha }})
--amend us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }}-ARM64 echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV
docker manifest push us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }}
- name: Create and push multi-arch manifest
run: |
docker manifest create us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }} \
--amend us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }}-X64 \
--amend us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }}-ARM64
docker manifest push us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }}