diff --git a/README.md b/README.md index c31fdab..7270e5d 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ jobs: env: # --- mandatory -------------------------------------------------------- KANIKO_CONTEXT: git://git.van-hemmen.com/actions/kaniko.git - GITHUB_REF_NAME: ${{ github.ref_name }} + GIT_REF_NAME: ${{ github.ref_name }} GIT_USERNAME: ${{ secrets.GIT_USERNAME }} GIT_PASSWORD: ${{ secrets.GIT_PASSWORD }} @@ -68,7 +68,7 @@ jobs: | Variable | Required | Purpose | Example value | |----------|----------|---------|----------------------------------------------------------------| | `KANIKO_CONTEXT` | **Yes** | Build context (`git://`). | `git://git.van-hemmen.com/actions/kaniko.git` | -| `GITHUB_REF_NAME` | **Yes** | Branch or tag that is being built. | `${{ github.ref_name }}` | +| `GIT_REF_NAME` | **Yes** | Branch or tag that is being built. | `${{ github.ref_name }}` | | `GIT_USERNAME` | **Yes** | Username with access to `KANIKO_CONTEXT` when it is private. | `${{ secrets.GIT_USERNAME }}` | | `GIT_PASSWORD` | **Yes** | Token/password paired with `GIT_USERNAME`. | `${{ secrets.GIT_PASSWORD }}` | | `REGISTRY_HOST` | No (default `git.van-hemmen.com`) | Target registry hostname. | `ghcr.io` | diff --git a/build.sh b/build.sh index 42e2e99..ef16afb 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ set -eu # BusyBox ash does not support “pipefail” ############################################################################### # Mandatory variables – abort if not provided ############################################################################### -for var in KANIKO_CONTEXT GITHUB_REF_NAME GIT_USERNAME GIT_PASSWORD; do +for var in KANIKO_CONTEXT GIT_REF_NAME GIT_USERNAME GIT_PASSWORD; do eval [ -z \"\${$var:-}\" ] && { echo "Error: $var environment variable is required but not set." >&2 exit 1 @@ -74,7 +74,7 @@ echo "Kaniko will be called with:${DEST_FLAGS}" ############################################################################### echo "Environment Variables:" echo "KANIKO_CONTEXT=${KANIKO_CONTEXT}" -echo "GITHUB_REF_NAME=${GITHUB_REF_NAME}" +echo "GIT_REF_NAME=${GIT_REF_NAME}" echo "GIT_USERNAME=${GIT_USERNAME}" echo "GIT_PASSWORD=$(echo "${GIT_PASSWORD}" | sed 's/\(^..\).*\(..$\)/\1...\2/')" echo "REGISTRY_HOST=${REGISTRY_HOST}" @@ -96,6 +96,6 @@ echo "" ############################################################################### exec /kaniko/executor \ --verbosity="${KANIKO_VERBOSITY}" \ - --context="${KANIKO_CONTEXT}#${GITHUB_REF_NAME}" \ + --context="${KANIKO_CONTEXT}#${GIT_REF_NAME}" \ --dockerfile="${KANIKO_DOCKERFILE}" \ $DEST_FLAGS