From 41a15a73195d13be80c919b36452c0a469158e90 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 9 Jan 2026 23:47:00 -0500 Subject: [PATCH] fix: set DOCKER_CONFIG to the directory holding the config.json --- plugins/builder-dockerfile/builder-build | 2 +- plugins/builder-dockerfile/builder-release | 2 +- plugins/builder-herokuish/builder-build | 2 +- plugins/builder-herokuish/builder-release | 2 +- plugins/builder-herokuish/pre-build | 2 +- plugins/builder-lambda/builder-build | 2 +- plugins/builder-lambda/builder-release | 2 +- plugins/builder-nixpacks/builder-build | 2 +- plugins/builder-nixpacks/builder-release | 2 +- plugins/builder-pack/builder-build | 2 +- plugins/builder-railpack/builder-build | 2 +- plugins/builder-railpack/builder-release | 2 +- plugins/common/functions | 4 ++-- plugins/git/git-from-image | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/builder-dockerfile/builder-build b/plugins/builder-dockerfile/builder-build index d15ef8fbe..93495a493 100755 --- a/plugins/builder-dockerfile/builder-build +++ b/plugins/builder-dockerfile/builder-build @@ -247,7 +247,7 @@ trigger-builder-dockerfile-builder-build() { eval "$(config_export app "$APP")" local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" "${DOCKERFILE_ARGS[@]}" --tag $IMAGE . diff --git a/plugins/builder-dockerfile/builder-release b/plugins/builder-dockerfile/builder-release index a9a331bd6..c19fb648c 100755 --- a/plugins/builder-dockerfile/builder-release +++ b/plugins/builder-dockerfile/builder-release @@ -30,7 +30,7 @@ trigger-builder-dockerfile-builder-release() { fi local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-dockerfile/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t "$IMAGE" "$TMP_WORK_DIR"; then dokku_log_warn "Failure injecting docker labels on image" diff --git a/plugins/builder-herokuish/builder-build b/plugins/builder-herokuish/builder-build index d24960dc8..55b6fd0d7 100755 --- a/plugins/builder-herokuish/builder-build +++ b/plugins/builder-herokuish/builder-build @@ -48,7 +48,7 @@ trigger-builder-herokuish-builder-build() { local DOCKER_BUILD_LABEL_ARGS=("--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.image-stage=build" "--label=com.dokku.builder-type=herokuish" "--label=com.dokku.app-name=$APP" "--label=dokku") local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG DOKKU_APP_USER=$(config_get "$APP" DOKKU_APP_USER || true) DOKKU_APP_USER=${DOKKU_APP_USER:="herokuishuser"} diff --git a/plugins/builder-herokuish/builder-release b/plugins/builder-herokuish/builder-release index 73df6ce7b..3c9db4be3 100755 --- a/plugins/builder-herokuish/builder-release +++ b/plugins/builder-herokuish/builder-release @@ -31,7 +31,7 @@ trigger-builder-herokuish-builder-release() { DOKKU_APP_USER=${DOKKU_APP_USER:="herokuishuser"} local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/builder-pre-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" --build-arg "DOKKU_APP_USER=$DOKKU_APP_USER" -t "$IMAGE" "$TMP_WORK_DIR"; then diff --git a/plugins/builder-herokuish/pre-build b/plugins/builder-herokuish/pre-build index dc1453e96..fa293dcd6 100755 --- a/plugins/builder-herokuish/pre-build +++ b/plugins/builder-herokuish/pre-build @@ -42,7 +42,7 @@ trigger-builder-herokuish-pre-build-buildpack() { DOKKU_APP_USER=$(config_get "$APP" DOKKU_APP_USER || true) DOKKU_APP_USER=${DOKKU_APP_USER:="herokuishuser"} local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/pre-build.Dockerfile" --build-arg APP_IMAGE="$IMAGE" --build-arg "DOKKU_APP_USER=$DOKKU_APP_USER" -t $IMAGE "$TMP_WORK_DIR"; then dokku_log_warn "Failure injecting BUILD_ENV into build environment" diff --git a/plugins/builder-lambda/builder-build b/plugins/builder-lambda/builder-build index d085a374e..beee01add 100755 --- a/plugins/builder-lambda/builder-build +++ b/plugins/builder-lambda/builder-build @@ -25,7 +25,7 @@ trigger-builder-lambda-builder-build() { plugn trigger pre-build "$BUILDER_TYPE" "$APP" "$SOURCECODE_WORK_DIR" local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG lambda-builder build --generate-image --write-procfile --image-env=DOCKER_LAMBDA_STAY_OPEN=1 --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.image-stage=build --label=com.dokku.builder-type=lambda "--label=com.dokku.app-name=$APP" $DOKKU_GLOBAL_BUILD_ARGS --port 5000 --tag "$IMAGE" --working-directory "$SOURCECODE_WORK_DIR" if [[ ! -f "$SOURCECODE_WORK_DIR/lambda.zip" ]]; then diff --git a/plugins/builder-lambda/builder-release b/plugins/builder-lambda/builder-release index ad3ebf32b..f5b9c3eb9 100755 --- a/plugins/builder-lambda/builder-release +++ b/plugins/builder-lambda/builder-release @@ -24,7 +24,7 @@ trigger-builder-lambda-builder-release() { local DOCKER_BUILD_LABEL_ARGS=("--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.image-stage=release" "--label=com.dokku.builder-type=lambda" "--label=com.dokku.app-name=$APP" "--label=dokku") local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-lambda/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t "$IMAGE" "$TMP_WORK_DIR"; then dokku_log_warn "Failure injecting docker labels on image" diff --git a/plugins/builder-nixpacks/builder-build b/plugins/builder-nixpacks/builder-build index dd2b41871..07e636644 100755 --- a/plugins/builder-nixpacks/builder-build +++ b/plugins/builder-nixpacks/builder-build @@ -244,7 +244,7 @@ trigger-builder-nixpacks-builder-build() { eval "$(config_export app "$APP" --merged)" local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG if ! nixpacks build "${DOCKER_BUILD_LABEL_ARGS[@]}" "${NIXPACKS_ARGS[@]}" --name "$IMAGE" "$SOURCECODE_WORK_DIR"; then diff --git a/plugins/builder-nixpacks/builder-release b/plugins/builder-nixpacks/builder-release index bf90016c7..c17bb5b7e 100755 --- a/plugins/builder-nixpacks/builder-release +++ b/plugins/builder-nixpacks/builder-release @@ -20,7 +20,7 @@ trigger-builder-nixpacks-builder-release() { local DOCKER_BUILD_LABEL_ARGS=("--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.image-stage=release" "--label=com.dokku.builder-type=nixpacks" "--label=com.dokku.app-name=$APP" "--label=dokku") local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-nixpacks/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t "$IMAGE" "$TMP_WORK_DIR"; then dokku_log_warn "Failure injecting docker labels on image" diff --git a/plugins/builder-pack/builder-build b/plugins/builder-pack/builder-build index 0041e0d23..0bf9aa924 100755 --- a/plugins/builder-pack/builder-build +++ b/plugins/builder-pack/builder-build @@ -294,7 +294,7 @@ trigger-builder-pack-builder-build() { fi local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web "${PACK_ARGS[@]}" "${ENV_ARGS[@]}" docker-image-labeler relabel --label=dokku --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.image-stage=build --label=com.dokku.builder-type=pack --label=com.dokku.app-name=$APP "$IMAGE" diff --git a/plugins/builder-railpack/builder-build b/plugins/builder-railpack/builder-build index 092b02be8..2329e06dd 100755 --- a/plugins/builder-railpack/builder-build +++ b/plugins/builder-railpack/builder-build @@ -126,7 +126,7 @@ trigger-builder-railpack-builder-build() { eval "$(config_export app "$APP" --merged)" local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG if ! railpack build "${RAILPACK_ARGS[@]}" --name "$IMAGE-build" "$SOURCECODE_WORK_DIR"; then diff --git a/plugins/builder-railpack/builder-release b/plugins/builder-railpack/builder-release index aca762295..fab96e427 100755 --- a/plugins/builder-railpack/builder-release +++ b/plugins/builder-railpack/builder-release @@ -20,7 +20,7 @@ trigger-builder-railpack-builder-release() { local DOCKER_BUILD_LABEL_ARGS=("--label=org.label-schema.schema-version=1.0" "--label=org.label-schema.vendor=dokku" "--label=com.dokku.image-stage=release" "--label=com.dokku.builder-type=railpack" "--label=com.dokku.app-name=$APP" "--label=dokku") local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-railpack/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t "$IMAGE" "$TMP_WORK_DIR"; then dokku_log_warn "Failure injecting docker labels on image" diff --git a/plugins/common/functions b/plugins/common/functions index 2bf73f328..d62d452f1 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -948,13 +948,13 @@ fn-migrate-config-to-property() { done } -fn-registry-docker-config() { +fn-registry-docker-config-dir() { declare desc="returns docker config file path if per-app registry credentials exist" declare APP="$1" local config_dir="/var/lib/dokku/config/registry/$APP" local config_file="$config_dir/config.json" if [[ -f "$config_file" ]] && [[ "$(jq -r '.auths | length' "$config_file" 2>/dev/null)" != "0" ]]; then - echo "$config_file" + echo "$config_dir" fi } diff --git a/plugins/git/git-from-image b/plugins/git/git-from-image index 9540dddac..99d9da1f3 100755 --- a/plugins/git/git-from-image +++ b/plugins/git/git-from-image @@ -27,7 +27,7 @@ trigger-git-git-from-image() { echo "LABEL com.dokku.docker-image-labeler/alternate-tags=[\\\"$DOCKER_IMAGE\\\"]" >>"$TMP_WORK_DIR/Dockerfile" local DOCKER_CONFIG - DOCKER_CONFIG="$(fn-registry-docker-config "$APP")" + DOCKER_CONFIG="$(fn-registry-docker-config-dir"$APP")" [[ -n "$DOCKER_CONFIG" ]] && export DOCKER_CONFIG if [[ "$("$DOCKER_BIN" image ls -q "$DOCKER_IMAGE" 2>/dev/null)" == "" ]]; then