Skip to content

Commit

Permalink
organize files used to distribute ziti
Browse files Browse the repository at this point in the history
  • Loading branch information
qrkourier committed Sep 5, 2023
1 parent 13a6749 commit 76bb986
Show file tree
Hide file tree
Showing 16 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/publish-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand All @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-linux-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 76bb986

Please sign in to comment.