From aafd99c6ca3ceb4fece9de35c5d74b131fb441cf Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Tue, 24 Jan 2023 13:32:12 -0500 Subject: [PATCH] finish organizing and testing Docker images --- .github/workflows/main.yml | 8 ++------ .github/workflows/publish-docker-images.yml | 10 +++++----- docker-images/{cli-base => ziti-cli}/Dockerfile | 0 docker-images/{cli-base => ziti-cli}/entrypoint.sh | 0 .../{controller => ziti-controller}/Dockerfile | 0 .../{controller => ziti-controller}/entrypoint.sh | 0 docker-images/{router => ziti-router}/Dockerfile | 0 docker-images/{router => ziti-router}/entrypoint.sh | 0 docker-images/{tunnel => ziti-tunnel}/Dockerfile | 0 docker-images/{tunnel => ziti-tunnel}/entrypoint.sh | 0 10 files changed, 7 insertions(+), 11 deletions(-) rename docker-images/{cli-base => ziti-cli}/Dockerfile (100%) rename docker-images/{cli-base => ziti-cli}/entrypoint.sh (100%) rename docker-images/{controller => ziti-controller}/Dockerfile (100%) rename docker-images/{controller => ziti-controller}/entrypoint.sh (100%) rename docker-images/{router => ziti-router}/Dockerfile (100%) rename docker-images/{router => ziti-router}/entrypoint.sh (100%) rename docker-images/{tunnel => ziti-tunnel}/Dockerfile (100%) rename docker-images/{tunnel => ziti-tunnel}/entrypoint.sh (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 09d621e5f..10fec44a1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,6 @@ env: jobs: mac-os-build: - if: github.repository_owner == 'openziti' name: Build Mac OS binaries runs-on: macos-11 steps: @@ -58,7 +57,6 @@ jobs: retention-days: 5 windows-build: - if: github.repository_owner == 'openziti' name: Build Windows binaries runs-on: windows-2019 steps: @@ -157,7 +155,7 @@ jobs: publish: name: Publish Binaries runs-on: ubuntu-20.04 - # needs: [ mac-os-build, windows-build, fablab-smoketest ] + needs: [ mac-os-build, windows-build, fablab-smoketest ] outputs: ZITI_VERSION: ${{ steps.get_version.outputs.ZITI_VERSION }} steps: @@ -203,14 +201,12 @@ jobs: retention-days: 5 - name: Download darwin release artifact - if: github.repository_owner == 'openziti' uses: actions/download-artifact@v3 with: name: darwin-release-${{ github.run_id }} path: release/ - name: Download windows release artifact - if: github.repository_owner == 'openziti' uses: actions/download-artifact@v3 with: name: windows-release-${{ github.run_id }} @@ -281,7 +277,7 @@ jobs: ziti-version: ${{ needs.publish.outputs.ZITI_VERSION }} call-publish-docker-images: - if: github.repository_owner == 'openziti' && (github.ref == 'refs/heads/main') + if: github.ref == 'refs/heads/main' name: Publish Docker Images needs: publish uses: ./.github/workflows/publish-docker-images.yml diff --git a/.github/workflows/publish-docker-images.yml b/.github/workflows/publish-docker-images.yml index 338b724a9..1596cb61f 100644 --- a/.github/workflows/publish-docker-images.yml +++ b/.github/workflows/publish-docker-images.yml @@ -56,11 +56,11 @@ jobs: with: builder: ${{ steps.buildx.outputs.name }} context: ${{ github.workspace }}/ - file: ${{ github.workspace }}/docker-images/cli-base/Dockerfile + file: ${{ github.workspace }}/docker-images/ziti-cli/Dockerfile platforms: linux/amd64,linux/arm64 tags: ${{ steps.tagprep_cli.outputs.DOCKER_TAGS }} build-args: | - DOCKER_BUILD_DIR=./docker-images/cli-base + DOCKER_BUILD_DIR=./docker-images/ziti-cli push: true - name: Set Up Container Image Tags for Controller Container @@ -80,7 +80,7 @@ jobs: uses: docker/build-push-action@v3 with: builder: ${{ steps.buildx.outputs.name }} - context: ${{ github.workspace }}/docker-images/controller/ + context: ${{ github.workspace }}/docker-images/ziti-controller/ platforms: linux/amd64,linux/arm64 tags: ${{ steps.tagprep_ctrl.outputs.DOCKER_TAGS }} build-args: | @@ -101,7 +101,7 @@ jobs: uses: docker/build-push-action@v3 with: builder: ${{ steps.buildx.outputs.name }} - context: ${{ github.workspace }}/docker-images/router/ + context: ${{ github.workspace }}/docker-images/ziti-router/ platforms: linux/amd64,linux/arm64 tags: ${{ steps.tagprep_router.outputs.DOCKER_TAGS }} build-args: | @@ -126,7 +126,7 @@ jobs: uses: docker/build-push-action@v3 with: builder: ${{ steps.buildx.outputs.name }} - context: ${{ github.workspace }}/docker-images/tunnel/ + context: ${{ github.workspace }}/docker-images/ziti-tunnel/ platforms: linux/amd64,linux/arm64 tags: ${{ steps.tagprep_tun.outputs.DOCKER_TAGS }} build-args: | diff --git a/docker-images/cli-base/Dockerfile b/docker-images/ziti-cli/Dockerfile similarity index 100% rename from docker-images/cli-base/Dockerfile rename to docker-images/ziti-cli/Dockerfile diff --git a/docker-images/cli-base/entrypoint.sh b/docker-images/ziti-cli/entrypoint.sh similarity index 100% rename from docker-images/cli-base/entrypoint.sh rename to docker-images/ziti-cli/entrypoint.sh diff --git a/docker-images/controller/Dockerfile b/docker-images/ziti-controller/Dockerfile similarity index 100% rename from docker-images/controller/Dockerfile rename to docker-images/ziti-controller/Dockerfile diff --git a/docker-images/controller/entrypoint.sh b/docker-images/ziti-controller/entrypoint.sh similarity index 100% rename from docker-images/controller/entrypoint.sh rename to docker-images/ziti-controller/entrypoint.sh diff --git a/docker-images/router/Dockerfile b/docker-images/ziti-router/Dockerfile similarity index 100% rename from docker-images/router/Dockerfile rename to docker-images/ziti-router/Dockerfile diff --git a/docker-images/router/entrypoint.sh b/docker-images/ziti-router/entrypoint.sh similarity index 100% rename from docker-images/router/entrypoint.sh rename to docker-images/ziti-router/entrypoint.sh diff --git a/docker-images/tunnel/Dockerfile b/docker-images/ziti-tunnel/Dockerfile similarity index 100% rename from docker-images/tunnel/Dockerfile rename to docker-images/ziti-tunnel/Dockerfile diff --git a/docker-images/tunnel/entrypoint.sh b/docker-images/ziti-tunnel/entrypoint.sh similarity index 100% rename from docker-images/tunnel/entrypoint.sh rename to docker-images/ziti-tunnel/entrypoint.sh