extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-25 01:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Docker repo use vars
This commit is contained in:
Kenneth Bingham 2023-12-15 13:16:48 -05:00 committed by GitHub
commit 523da9d1a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.flake8 Normal file
View File

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

1
.github/workflows/build-wheels.yml vendored
View File

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

7
.github/workflows/publish-docker-images.yml vendored
View File

@ -72,11 +72,12 @@ jobs:
- name: Set Up Container Image Tags for zrok CLI Container - name: Set Up Container Image Tags for zrok CLI Container
env: env:
RELEASE_REPO: openziti/zrok ZROK_CONTAINER_IMAGE_REPO: ${{ vars.ZROK_CONTAINER_IMAGE_REPO || 'openziti/zrok' }}
ZROK_VERSION: ${{ steps.semver.outputs.zrok_semver }} ZROK_CONTAINER_IMAGE_TAG: ${{ steps.semver.outputs.zrok_semver }}
id: tagprep_cli id: tagprep_cli
run: | 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 # this is the CLI image with the Linux binary for each
# arch that was downloaded in ./dist/ # arch that was downloaded in ./dist/

18
sdk/python/sdk/zrok/setup.py
View File

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