@@ -35,17 +35,25 @@ runs:
3535 - name : Build Docker image
3636 id : build
3737 shell : bash
38+ env :
39+ APP_NAME : ${{ inputs.app_name }}
40+ COMMIT : ${{ inputs.commit }}
41+ DOCKER_BUILD_EXTRA_ARGS : ${{ inputs.docker_build_extra_args }}
42+ DOCKER_BUILD_SSH_KEY : ${{ inputs.docker_build_ssh_key }}
43+ DOCKER_BUILD_SSH_KNOWN_HOSTS : ${{ inputs.docker_build_ssh_known_hosts }}
44+ ORG : ${{ inputs.org }}
45+ PR_NUMBER : ${{ inputs.pr_number }}
3846 run : |
3947 set -euo pipefail
4048
4149 PR_INFO=""
4250 docker_build_args=()
4351
44- if [[ -n "${{ inputs.pr_number }} " ]]; then
45- PR_INFO=" for PR #${{ inputs.pr_number } }"
52+ if [[ -n "$PR_NUMBER " ]]; then
53+ PR_INFO=" for PR #${PR_NUMBER }"
4654 fi
4755
48- if [[ -n "${{ inputs.docker_build_extra_args }} " ]]; then
56+ if [[ -n "$DOCKER_BUILD_EXTRA_ARGS " ]]; then
4957 while IFS= read -r arg; do
5058 arg="${arg%$'\r'}"
5159 [[ -n "${arg}" ]] || continue
@@ -57,17 +65,15 @@ runs:
5765 fi
5866
5967 docker_build_args+=("${arg}")
60- done <<< "${{ inputs.docker_build_extra_args }} "
68+ done <<< "$DOCKER_BUILD_EXTRA_ARGS "
6169 fi
6270
63- if [[ -n "${{ inputs.docker_build_ssh_key }} " ]]; then
71+ if [[ -n "$DOCKER_BUILD_SSH_KEY " ]]; then
6472 mkdir -p ~/.ssh
6573 chmod 700 ~/.ssh
6674
67- if [[ -n "${{ inputs.docker_build_ssh_known_hosts }}" ]]; then
68- cat <<'EOF' > ~/.ssh/known_hosts
69- ${{ inputs.docker_build_ssh_known_hosts }}
70- EOF
75+ if [[ -n "$DOCKER_BUILD_SSH_KNOWN_HOSTS" ]]; then
76+ printf '%s\n' "$DOCKER_BUILD_SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
7177 else
7278 cat <<'EOF' > ~/.ssh/known_hosts
7379 github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
@@ -80,13 +86,14 @@ runs:
8086
8187 eval "$(ssh-agent -s)"
8288 trap 'ssh-agent -k >/dev/null' EXIT
83- ssh-add - <<< "${{ inputs.docker_build_ssh_key }}"
89+ ssh-add - <<< "$DOCKER_BUILD_SSH_KEY"
90+ unset DOCKER_BUILD_SSH_KEY
8491 docker_build_args+=("--ssh=default")
8592 fi
8693
87- echo "🏗️ Building Docker image${PR_INFO} (commit ${{ inputs.commit } })..."
88- cpflow build-image -a "${{ inputs.app_name }} " --commit="${{ inputs.commit }} " --org="${{ inputs.org }} " "${docker_build_args[@]}"
94+ echo "🏗️ Building Docker image${PR_INFO} (commit ${COMMIT })..."
95+ cpflow build-image -a "$APP_NAME " --commit="$COMMIT " --org="$ORG " "${docker_build_args[@]}"
8996
90- image_tag="${{ inputs.org }} /${{ inputs.app_name }} :${{ inputs.commit } }"
97+ image_tag="${ORG} /${APP_NAME} :${COMMIT }"
9198 echo "image_tag=${image_tag}" >> "$GITHUB_OUTPUT"
92- echo "✅ Docker image build successful${PR_INFO} (commit ${{ inputs.commit } })"
99+ echo "✅ Docker image build successful${PR_INFO} (commit ${COMMIT })"
0 commit comments