Merge pull request 'Fix customer registry credential selection' (#11) from feature/customer-registry-auth-fix-20260722 into main
Some checks failed
CI/CD Pipeline / Code Quality Checks (push) Successful in 2m50s
Deploy Customer Main / Build, Push, Deploy (push) Failing after 2s
CI/CD Pipeline / Run Tests (push) Successful in 3m3s
CI/CD Pipeline / Build and Push Dev Images (push) Has been skipped
CI/CD Pipeline / Deploy Dev via Compose (push) Has been skipped
Some checks failed
CI/CD Pipeline / Code Quality Checks (push) Successful in 2m50s
Deploy Customer Main / Build, Push, Deploy (push) Failing after 2s
CI/CD Pipeline / Run Tests (push) Successful in 3m3s
CI/CD Pipeline / Build and Push Dev Images (push) Has been skipped
CI/CD Pipeline / Deploy Dev via Compose (push) Has been skipped
This commit was merged in pull request #11.
This commit is contained in:
@@ -57,8 +57,8 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
registry_user="${REGISTRY_USER:-${REGISTRY_USERNAME:-${GITHUB_ACTOR:-}}}"
|
||||
registry_password="${REGISTRY_TOKEN:-${REGISTRY_PASSWORD:-${GITEA_TOKEN:-}}}"
|
||||
registry_user="${REGISTRY_USERNAME:-${REGISTRY_USER:-${GITHUB_ACTOR:-}}}"
|
||||
registry_password="${REGISTRY_PASSWORD:-${REGISTRY_TOKEN:-${GITEA_TOKEN:-}}}"
|
||||
home_dir="${HOME:-/root}"
|
||||
|
||||
if [ -z "${registry_user}" ]; then
|
||||
@@ -98,8 +98,8 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
registry_user="${REGISTRY_USER:-${REGISTRY_USERNAME:-${GITHUB_ACTOR:-}}}"
|
||||
registry_password="${REGISTRY_TOKEN:-${REGISTRY_PASSWORD:-${GITEA_TOKEN:-}}}"
|
||||
registry_user="${REGISTRY_USERNAME:-${REGISTRY_USER:-${GITHUB_ACTOR:-}}}"
|
||||
registry_password="${REGISTRY_PASSWORD:-${REGISTRY_TOKEN:-${GITEA_TOKEN:-}}}"
|
||||
sha_short="$(printf '%s' "${GITHUB_SHA}" | cut -c1-12)"
|
||||
registry_path="${CUSTOMER_REGISTRY_HOST}/${CUSTOMER_REGISTRY_NAMESPACE}"
|
||||
web_ref="${registry_path}/${CUSTOMER_WEB_IMAGE}"
|
||||
|
||||
Reference in New Issue
Block a user