diff --git a/.gitea/actions/buildkit-build-push-dev/action.yaml b/.gitea/actions/buildkit-build-push-dev/action.yaml index 84c5a0c..99b64b0 100644 --- a/.gitea/actions/buildkit-build-push-dev/action.yaml +++ b/.gitea/actions/buildkit-build-push-dev/action.yaml @@ -38,51 +38,34 @@ runs: - name: run buildctl build and push shell: bash run: | - ############################################### - # Create DOCKER_CONFIG for this pipeline - ############################################### + ############################################### + # Build args + ############################################### - DOCKER_CONFIG_DIR="${RUNNER_TEMP}/.buildctl_docker" - mkdir -p "$DOCKER_CONFIG_DIR" + BUILD_ARG_FLAGS="" + while IFS= read -r line; do + [[ -z "$line" ]] && continue + BUILD_ARG_FLAGS="$BUILD_ARG_FLAGS --opt build-arg:${line}" + done <<< "${{ inputs.build_args }}" - trap 'rm -rf "$DOCKER_CONFIG_DIR"' EXIT + echo "Using build args: $BUILD_ARG_FLAGS" - AUTH=$(printf "%s:%s" "${{ inputs.registry_username }}" "${{ inputs.registry_password }}" | base64 -w0) + ############################################### + # Inline auth for BuildKit remote push + ############################################### - cat > "$DOCKER_CONFIG_DIR/config.json" <