From 76bb9861273bd06c2fef8e0fbc7534a66ca13d0c Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Tue, 5 Sep 2023 15:41:06 -0400 Subject: [PATCH] organize files used to distribute ziti --- .github/workflows/publish-docker-images.yml | 10 +++++----- .github/workflows/publish-linux-packages.yml | 2 +- {build => dist}/dist-packages/README.md | 0 {build => dist}/dist-packages/linux/nfpm-ziti-cli.yaml | 0 .../docker-images}/cross-build/Dockerfile | 0 .../docker-images}/cross-build/README.md | 0 .../docker-images}/cross-build/linux-build.sh | 0 .../docker-images}/ziti-cli/Dockerfile | 0 {docker-images => dist/docker-images}/ziti-cli/bashrc | 0 .../docker-images}/ziti-cli/entrypoint.sh | 0 .../docker-images}/ziti-controller/Dockerfile | 0 .../docker-images}/ziti-controller/entrypoint.sh | 0 .../docker-images}/ziti-router/Dockerfile | 0 .../docker-images}/ziti-router/entrypoint.sh | 0 .../docker-images}/ziti-tunnel/Dockerfile | 0 .../docker-images}/ziti-tunnel/entrypoint.sh | 0 16 files changed, 6 insertions(+), 6 deletions(-) rename {build => dist}/dist-packages/README.md (100%) rename {build => dist}/dist-packages/linux/nfpm-ziti-cli.yaml (100%) rename {docker-images => dist/docker-images}/cross-build/Dockerfile (100%) rename {docker-images => dist/docker-images}/cross-build/README.md (100%) rename {docker-images => dist/docker-images}/cross-build/linux-build.sh (100%) rename {docker-images => dist/docker-images}/ziti-cli/Dockerfile (100%) rename {docker-images => dist/docker-images}/ziti-cli/bashrc (100%) rename {docker-images => dist/docker-images}/ziti-cli/entrypoint.sh (100%) rename {docker-images => dist/docker-images}/ziti-controller/Dockerfile (100%) rename {docker-images => dist/docker-images}/ziti-controller/entrypoint.sh (100%) rename {docker-images => dist/docker-images}/ziti-router/Dockerfile (100%) rename {docker-images => dist/docker-images}/ziti-router/entrypoint.sh (100%) rename {docker-images => dist/docker-images}/ziti-tunnel/Dockerfile (100%) rename {docker-images => dist/docker-images}/ziti-tunnel/entrypoint.sh (100%) diff --git a/.github/workflows/publish-docker-images.yml b/.github/workflows/publish-docker-images.yml index fc9fce4c2..5dfbd5ae2 100644 --- a/.github/workflows/publish-docker-images.yml +++ b/.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: | diff --git a/.github/workflows/publish-linux-packages.yml b/.github/workflows/publish-linux-packages.yml index 23f660bdd..45556d1da 100644 --- a/.github/workflows/publish-linux-packages.yml +++ b/.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 diff --git a/build/dist-packages/README.md b/dist/dist-packages/README.md similarity index 100% rename from build/dist-packages/README.md rename to dist/dist-packages/README.md diff --git a/build/dist-packages/linux/nfpm-ziti-cli.yaml b/dist/dist-packages/linux/nfpm-ziti-cli.yaml similarity index 100% rename from build/dist-packages/linux/nfpm-ziti-cli.yaml rename to dist/dist-packages/linux/nfpm-ziti-cli.yaml diff --git a/docker-images/cross-build/Dockerfile b/dist/docker-images/cross-build/Dockerfile similarity index 100% rename from docker-images/cross-build/Dockerfile rename to dist/docker-images/cross-build/Dockerfile diff --git a/docker-images/cross-build/README.md b/dist/docker-images/cross-build/README.md similarity index 100% rename from docker-images/cross-build/README.md rename to dist/docker-images/cross-build/README.md diff --git a/docker-images/cross-build/linux-build.sh b/dist/docker-images/cross-build/linux-build.sh similarity index 100% rename from docker-images/cross-build/linux-build.sh rename to dist/docker-images/cross-build/linux-build.sh diff --git a/docker-images/ziti-cli/Dockerfile b/dist/docker-images/ziti-cli/Dockerfile similarity index 100% rename from docker-images/ziti-cli/Dockerfile rename to dist/docker-images/ziti-cli/Dockerfile diff --git a/docker-images/ziti-cli/bashrc b/dist/docker-images/ziti-cli/bashrc similarity index 100% rename from docker-images/ziti-cli/bashrc rename to dist/docker-images/ziti-cli/bashrc diff --git a/docker-images/ziti-cli/entrypoint.sh b/dist/docker-images/ziti-cli/entrypoint.sh similarity index 100% rename from docker-images/ziti-cli/entrypoint.sh rename to dist/docker-images/ziti-cli/entrypoint.sh diff --git a/docker-images/ziti-controller/Dockerfile b/dist/docker-images/ziti-controller/Dockerfile similarity index 100% rename from docker-images/ziti-controller/Dockerfile rename to dist/docker-images/ziti-controller/Dockerfile diff --git a/docker-images/ziti-controller/entrypoint.sh b/dist/docker-images/ziti-controller/entrypoint.sh similarity index 100% rename from docker-images/ziti-controller/entrypoint.sh rename to dist/docker-images/ziti-controller/entrypoint.sh diff --git a/docker-images/ziti-router/Dockerfile b/dist/docker-images/ziti-router/Dockerfile similarity index 100% rename from docker-images/ziti-router/Dockerfile rename to dist/docker-images/ziti-router/Dockerfile diff --git a/docker-images/ziti-router/entrypoint.sh b/dist/docker-images/ziti-router/entrypoint.sh similarity index 100% rename from docker-images/ziti-router/entrypoint.sh rename to dist/docker-images/ziti-router/entrypoint.sh diff --git a/docker-images/ziti-tunnel/Dockerfile b/dist/docker-images/ziti-tunnel/Dockerfile similarity index 100% rename from docker-images/ziti-tunnel/Dockerfile rename to dist/docker-images/ziti-tunnel/Dockerfile diff --git a/docker-images/ziti-tunnel/entrypoint.sh b/dist/docker-images/ziti-tunnel/entrypoint.sh similarity index 100% rename from docker-images/ziti-tunnel/entrypoint.sh rename to dist/docker-images/ziti-tunnel/entrypoint.sh