finish organizing and testing Docker images

.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

.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: |