Update changelog and version. Grab latest workflows

.github/workflows/fablab-db-creation.yml

@@ -20,11 +20,10 @@ jobs:
   build:
     name: Build and Run
     runs-on: ubuntu-latest
+    if: github.repository_owner == 'openziti'
     steps:
       - name: Checkout ziti
         uses: actions/checkout@v4
-        with:
-          path: ziti
 
       - name: Install Go
         id: setup-go
@@ -37,19 +36,17 @@ jobs:
 
       - name: Configure Git
         run: |
-          cd ziti
           $(go env GOPATH)/bin/ziti-ci configure-git
 
       - name: Pull ZITI_VERSION and set as $GITHUB_ENV for use with fablab
         run: |
-          cd ziti
           version="$($(go env GOPATH)/bin/ziti-ci -q get-current-version)"
           echo "Ziti Version: $version"
           echo "ZITI_VERSION=$version" >> $GITHUB_ENV
 
       - name: Build and Run
         run: |
-          cd ziti/zititest/models/db-creation
+          cd ./zititest/models/db-creation
           go build -o db-creation main.go
           echo "ZITI_ROOT=$(go env GOPATH)/bin" >> "$GITHUB_ENV"
           ./db-creation create db-creation
@@ -58,5 +55,5 @@ jobs:
       - name: Teardown
         if: always()
         run: |
-          cd ziti/zititest/models/db-creation          
+          cd ./zititest/models/db-creation          
           ./db-creation dispose

.github/workflows/golangci-lint.yml

@@ -25,10 +25,10 @@ jobs:
           go-version-file: ./go.mod
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v5
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.55.2
+          version: v1.57.2
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.github/workflows/main.yml

@@ -167,7 +167,7 @@ jobs:
   fablab-smoketest:
     name: Fablab Smoketest
     # not applicable to forks. shouldn't run on release build
-    if: github.repository_owner == 'openziti' && github.ref != 'refs/heads/main'
+    if: github.repository_owner == 'openziti' && github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/release-v')
     runs-on: ubuntu-20.04
     steps:
       - name: Git Checkout
@@ -462,11 +462,6 @@ jobs:
                 -path "./release/*/linux/ziti" \
             | xargs -0 chmod -c +x
 
-      - name: Install Jfrog CLI
-        uses: jfrog/setup-jfrog-cli@v4
-        with:
-          version: 1.51.1
-
       - name: Publish GitHub Release
         # forks need to run this step with their own GPG key because ziti-ci creates the GH release 
         if: env.ziti_ci_gpg_key_id != null && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-v'))
@@ -478,7 +473,7 @@ jobs:
         run: |
           $(go env GOPATH)/bin/ziti-ci configure-git
           $(go env GOPATH)/bin/ziti-ci tag -v -f version
-          $(go env GOPATH)/bin/ziti-ci publish-to-github --archive-base ""
+          $(go env GOPATH)/bin/ziti-ci publish-to-github --prerelease --archive-base ""
 
       # only ziti-ci computed version for release branches and {version}-{run_id} for non-release branches
       - name: Compute the Ziti Version String for CI Jobs
@@ -505,15 +500,6 @@ jobs:
             echo ZITI_VERSION="${ZITI_VERSION}" | tee -a $GITHUB_OUTPUT
           fi
 
-      - name: Publish to Artifactory
-        if: ${{ env.JFROG_API_KEY != null && github.repository == 'openziti/ziti' }}
-        shell: bash
-        run: |
-          $(go env GOPATH)/bin/ziti-ci publish-to-artifactory
-        env:
-          JFROG_API_KEY: ${{ secrets.JFROG_API_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   call-publish-prerelease-docker-images:
     # - !cancelled() allows evaluating further conditional expressions even if
     #   needed jobs were skipped

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

@@ -96,12 +96,14 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
-          context: ${{ github.workspace }}/dist/docker-images/ziti-controller/
+          context: ${{ github.workspace }}/
+          file: ${{ github.workspace }}/dist/docker-images/ziti-controller/Dockerfile
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.tagprep_ctrl.outputs.DOCKER_TAGS }}
           build-args: |
             ZITI_CLI_TAG=${{ env.ZITI_CLI_TAG }}
             ZITI_CLI_IMAGE=${{ env.ZITI_CLI_IMAGE }}
+            DOCKER_BUILD_DIR=./dist/docker-images/ziti-controller
           push: true
 
       - name: Set Up Container Image Tags for Router Container
@@ -116,19 +118,20 @@ jobs:
           if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
             DOCKER_TAGS+=",${IMAGE_REPO}:latest"
           fi
-          echo "DEBUG: DOCKER_TAGS=${DOCKER_TAGS}"
-          echo DOCKER_TAGS="${DOCKER_TAGS}" >> $GITHUB_OUTPUT
+          echo DOCKER_TAGS="${DOCKER_TAGS}" | tee -a $GITHUB_OUTPUT
 
       - name: Build & Push Multi-Platform Router Container Image to Hub
         uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
-          context: ${{ github.workspace }}/dist/docker-images/ziti-router/
+          context: ${{ github.workspace }}/
+          file: ${{ github.workspace }}/dist/docker-images/ziti-router/Dockerfile
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.tagprep_router.outputs.DOCKER_TAGS }}
           build-args: |
             ZITI_CLI_TAG=${{ env.ZITI_CLI_TAG }}
             ZITI_CLI_IMAGE=${{ env.ZITI_CLI_IMAGE }}
+            DOCKER_BUILD_DIR=./dist/docker-images/ziti-router
           push: true
 
       - name: Set Up Container Image Tags for Go Tunneler Container

.github/workflows/publish-linux-packages.yml

@@ -16,6 +16,8 @@ jobs:
       matrix:
         package_name:
           - openziti
+          - openziti-controller
+          - openziti-router
         arch:
           - goreleaser: amd64
             gox: amd64
@@ -40,6 +42,7 @@ jobs:
       ZITI_HOMEPAGE: "https://openziti.io"
       ZITI_VENDOR: "NetFoundry"
       GOARCH: ${{ matrix.arch.goreleaser }}
+      MINIMUM_SYSTEMD_VERSION: 232
       ZITI_DEB_TEST_REPO: ${{ vars.ZITI_DEB_TEST_REPO || 'zitipax-openziti-deb-test' }}
       ZITI_DEB_PROD_REPO: ${{ vars.ZITI_DEB_PROD_REPO || 'zitipax-openziti-deb-stable' }}
       ZITI_RPM_TEST_REPO: ${{ vars.ZITI_RPM_TEST_REPO || 'zitipax-openziti-rpm-test' }}

.github/workflows/test-quickstart.yml

@@ -43,7 +43,7 @@ jobs:
     name: Test all-in-one Quickstart
     runs-on: ubuntu-latest
     env:
-      ZITI_QUICK_TAG: local  # override default :latest since we're not pulling from registry
+      ZITI_CLI_TAG: local  # override default :latest since we're not pulling from registry
       ARTIFACTS_DIR: ${{ github.workspace }}/build  # output dir for `go build`, input dir for `compose up --build`
       ZIGGY_UID: 1001  # let container EUID run-as GHA "runner" user to share cache, etc.
     steps:

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Release 1.0.0
 
+This is a re-release of v1.0 as v0.34.x, to address an issue with docker containers which 
+don't correctly parse the major version
+
 ## About 1.0
 
 What does marking OpenZiti as 1.0 mean?

version

@@ -1 +1 @@
-1.0
+0.34