Merge pull request #1295 from openziti/build-organize

organize files used to distribute ziti

.github/workflows/publish-docker-images.yml

@@ -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

@@ -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