fix github owner/name assignments

qrkourier · Sep 23, 2024 · 25f9120 · 25f9120
1 parent f26e002
commit 25f9120
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/release-quickstart.yml b/.github/workflows/release-quickstart.yml
@@ -141,8 +141,8 @@ jobs:
           tags: ${{ steps.tagprep_qs.outputs.DOCKER_TAGS }}
           build-args: |
             ZITI_VERSION_OVERRIDE=${{ steps.get_version.outputs.ZITI_VERSION_OVERRIDE }}
-            GITHUB_OWNER=${GITHUB_OWNER}
-            GITHUB_REPO=${GITHUB_REPO}
+            GITHUB_REPO_OWNER=${{ github.repository_owner }}
+            GITHUB_REPO_NAME=${{ github.event.repository.name }}
           push: true
 
       - name: Configure Python

diff --git a/quickstart/docker/image/Dockerfile b/quickstart/docker/image/Dockerfile
@@ -3,10 +3,10 @@ FROM ubuntu:rolling AS fetch-ziti-bins
 # optional arg to specify which version to fetch when local "ziti-bin" directory is not present
 ARG ZITI_VERSION_OVERRIDE
 ARG DEBIAN_FRONTEND=noninteractive
-ARG GITHUB_OWNER=openziti
-ARG GITHUB_REPO=ziti
-ENV GITHUB_OWNER=${GITHUB_OWNER}
-ENV GITHUB_REPO=${GITHUB_REPO}
+ARG GITHUB_REPO_OWNER=openziti
+ARG GITHUB_REPO_NAME=ziti
+ENV GITHUB_REPO_OWNER=${GITHUB_REPO_OWNER}
+ENV GITHUB_REPO_NAME=${GITHUB_REPO_NAME}
 
 RUN apt-get update \
     && apt-get --yes install \

diff --git a/quickstart/docker/image/ziti-cli-functions.sh b/quickstart/docker/image/ziti-cli-functions.sh
@@ -12,8 +12,8 @@ ASCI_BLUE='\033[00;34m'
 ASCI_PURPLE='\033[00;35m'
 ZITIx_EXPRESS_COMPLETE=""
 
-: "${GITHUB_OWNER:=openziti}"
-: "${GITHUB_REPO:=ziti}"
+: "${GITHUB_REPO_OWNER:=openziti}"
+: "${GITHUB_REPO_NAME:=ziti}"
 
 function WHITE {
   echo "${ASCI_WHITE}${1-}${ASCI_RESTORE}"
@@ -248,7 +248,7 @@ function _check_env_variable() {
         _error=true
       fi
     else
-      echo -e " * $(RED "Unsupported shell, supply a PR or log an issue on https://github.com/${GITHUB_OWNER}/${GITHUB_REPO}") "
+      echo -e " * $(RED "Unsupported shell, supply a PR or log an issue on https://github.com/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}") "
       return 1
     fi
   done
@@ -737,7 +737,7 @@ function getZiti {
   fi
 
   # Get the download link
-  zitidl="https://github.com/${GITHUB_OWNER}/${GITHUB_REPO}/releases/download/${ZITI_BINARIES_VERSION-}/${ZITI_BINARIES_FILE}"
+  zitidl="https://github.com/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}/releases/download/${ZITI_BINARIES_VERSION-}/${ZITI_BINARIES_FILE}"
   echo -e 'Downloading '"$(BLUE "${zitidl}")"' to '"$(BLUE "${ziti_binaries_file_abspath}")"
   curl -Ls "${zitidl}" -o "${ziti_binaries_file_abspath}"
 
@@ -1142,7 +1142,7 @@ function getLatestZitiVersion {
 
   _detect_architecture
 
-  ziti_latest=$(curl -s https://${GITHUB_TOKEN:+${GITHUB_TOKEN}@}api.github.com/repos/${GITHUB_OWNER}/${GITHUB_REPO}/releases/latest)
+  ziti_latest=$(curl -s https://${GITHUB_TOKEN:+${GITHUB_TOKEN}@}api.github.com/repos/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}/releases/latest)
   ZITI_BINARIES_FILE=$(printf "%s" "${ziti_latest}" | tr '\r\n' ' ' | jq -r '.assets[] | select(.name | startswith("'"ziti-${ZITI_OSTYPE}-${ZITI_ARCH}-"'")) | .name')
   ZITI_BINARIES_VERSION=$(printf "%s" "${ziti_latest}" | tr '\r\n' ' ' | jq -r '.tag_name')
 }
@@ -1499,7 +1499,7 @@ function _verify_ziti_version_exists {
 
   _detect_architecture
 
-  ziticurl="$(curl -s https://${GITHUB_TOKEN:+${GITHUB_TOKEN}@}api.github.com/repos/${GITHUB_OWNER}/${GITHUB_REPO}/releases/tags/"${ZITI_VERSION_OVERRIDE}")"
+  ziticurl="$(curl -s https://${GITHUB_TOKEN:+${GITHUB_TOKEN}@}api.github.com/repos/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}/releases/tags/"${ZITI_VERSION_OVERRIDE}")"
   ZITI_BINARIES_FILE=$(echo "${ziticurl}" | tr '\r\n' ' ' | jq -r '.assets[] | select(.name | startswith("'"ziti-${ZITI_OSTYPE}-${ZITI_ARCH}-"'")) | .name')
   ZITI_BINARIES_VERSION=$(echo "${ziticurl}" | tr '\r\n' ' ' | jq -r '.tag_name')