gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-11 15:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1295 from openziti/build-organize

Browse Source 
organize files used to distribute ziti
This commit is contained in:
Ken Bingham
2023-09-05 17:30:58 -04:00
committed by GitHub
parent 5f169bb9f7 76bb986127
commit 39d5bf67fb
16 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/publish-docker-images.yml
+5 -5
View File
@@ -65,11 +65,11 @@ jobs:
with:
builder: ${{ steps.buildx.outputs.name }}
context: ${{ github.workspace }}/
file: ${{ github.workspace }}/docker-images/ziti-cli/Dockerfile
file: ${{ github.workspace }}/dist/docker-images/ziti-cli/Dockerfile
platforms: linux/amd64,linux/arm64
tags: ${{ steps.tagprep_cli.outputs.DOCKER_TAGS }}
build-args: |
DOCKER_BUILD_DIR=./docker-images/ziti-cli
DOCKER_BUILD_DIR=./dist/docker-images/ziti-cli
push: true
- name: Set Up Container Image Tags for Controller Container
@@ -92,7 +92,7 @@ jobs:
uses: docker/build-push-action@v3
with:
builder: ${{ steps.buildx.outputs.name }}
context: ${{ github.workspace }}/docker-images/ziti-controller/
context: ${{ github.workspace }}/dist/docker-images/ziti-controller/
platforms: linux/amd64,linux/arm64
tags: ${{ steps.tagprep_ctrl.outputs.DOCKER_TAGS }}
build-args: |
@@ -117,7 +117,7 @@ jobs:
uses: docker/build-push-action@v3
with:
builder: ${{ steps.buildx.outputs.name }}
context: ${{ github.workspace }}/docker-images/ziti-router/
context: ${{ github.workspace }}/dist/docker-images/ziti-router/
platforms: linux/amd64,linux/arm64
tags: ${{ steps.tagprep_router.outputs.DOCKER_TAGS }}
build-args: |
@@ -146,7 +146,7 @@ jobs:
uses: docker/build-push-action@v3
with:
builder: ${{ steps.buildx.outputs.name }}
context: ${{ github.workspace }}/docker-images/ziti-tunnel/
context: ${{ github.workspace }}/dist/docker-images/ziti-tunnel/
platforms: linux/amd64,linux/arm64
tags: ${{ steps.tagprep_tun.outputs.DOCKER_TAGS }}
build-args: |
.github/workflows/publish-linux-packages.yml
+1 -1
View File
@@ -61,7 +61,7 @@ jobs:
with:
nfpm_version: "2.32.0"
packager: ${{ matrix.nfpm_packager }}
config: build/dist-packages/linux/nfpm-${{ matrix.package_name }}.yaml
config: dist/dist-packages/linux/nfpm-${{ matrix.package_name }}.yaml
target: release/
- name: get the package name from the output