Merge pull request #494 from openziti/docker-repo-use-vars

Docker repo use vars

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 120

.github/workflows/build-wheels.yml

@@ -35,6 +35,7 @@ jobs:
       - name: Build distro
         env:
           ZROK_VERSION: ${{ github.event.release.tag_name }}
+          ZROK_PY_NAME: ${{ vars.ZROK_PY_NAME || null }}
         run: |
           python setup.py sdist
 

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

@@ -72,11 +72,12 @@ jobs:
 
       - name: Set Up Container Image Tags for zrok CLI Container
         env:
-          RELEASE_REPO: openziti/zrok
-          ZROK_VERSION: ${{ steps.semver.outputs.zrok_semver }}
+          ZROK_CONTAINER_IMAGE_REPO: ${{ vars.ZROK_CONTAINER_IMAGE_REPO || 'openziti/zrok' }}
+          ZROK_CONTAINER_IMAGE_TAG: ${{ steps.semver.outputs.zrok_semver }}
         id: tagprep_cli
         run: |
-          echo DOCKER_TAGS="${RELEASE_REPO}:${ZROK_VERSION},${RELEASE_REPO}:latest" | tee -a $GITHUB_OUTPUT
+          echo DOCKER_TAGS="${ZROK_CONTAINER_IMAGE_REPO}:${ZROK_CONTAINER_IMAGE_TAG},${ZROK_CONTAINER_IMAGE_REPO}:latest" \
+          | tee -a $GITHUB_OUTPUT
 
       # this is the CLI image with the Linux binary for each
       # arch that was downloaded in ./dist/

sdk/python/sdk/zrok/setup.py

@@ -1,16 +1,20 @@
-from setuptools import setup, find_packages  # noqa: H301
 import os
 
-NAME = "zrok_sdk"
-VERSION = "0.4.0.dev"
-try:
-    VERSION = os.environ['ZROK_VERSION']
-except KeyError: 
-    pass
+from setuptools import find_packages, setup  # noqa: H301
+
+# optionally upload to TestPyPi with alternative name in testing repo
+NAME = os.getenv('ZROK_PY_NAME', "zrok_sdk")
+# inherit zrok version from environment or default to dev version
+VERSION = os.getenv('ZROK_VERSION', "0.4.0.dev")
+
 # To install the library, run the following
 #
 # python setup.py install
 #
+# or
+#
+# pip install --editable .
+#
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools