@@ -113,19 +113,31 @@ jobs:
113113 PLATFORMS="linux/amd64,linux/arm64"
114114 fi
115115 echo "PLATFORMS=$PLATFORMS" >> $GITHUB_ENV
116-
117- # Generate commit hash for dev builds
116+
117+ # Generate commit hash for dev builds (for image tagging only)
118118 COMMIT_HASH=$(git rev-parse --short HEAD)
119119 echo "COMMIT_HASH=$COMMIT_HASH" >> $GITHUB_ENV
120-
120+
121+ # Set PYATLAN_COMMIT_SHA only if pyatlan_branch input is provided
122+ # Otherwise, leave empty to let Dockerfile use version tag
123+ if [ -n "${{ github.event.inputs.pyatlan_branch }}" ]; then
124+ echo "PYATLAN_COMMIT_SHA=${{ github.event.inputs.pyatlan_branch }}" >> $GITHUB_ENV
125+ else
126+ echo "PYATLAN_COMMIT_SHA=" >> $GITHUB_ENV
127+ fi
128+
121129 echo "Build parameters:"
122130 echo " - Trigger: ${{ github.event_name }}"
123131 echo " - Build Type: $BUILD_TYPE"
124132 echo " - Python Version: $PYTHON_VERSION"
125- echo " - Pyatlan Version: $PYATLAN_VERSION (from git tag v${PYATLAN_VERSION})"
133+ if [ -n "${{ github.event.inputs.pyatlan_branch }}" ]; then
134+ echo " - Pyatlan Source: git commit/branch ${{ github.event.inputs.pyatlan_branch }}"
135+ else
136+ echo " - Pyatlan Source: git tag v${PYATLAN_VERSION}"
137+ fi
126138 echo " - Build Method: Multi-stage build from GitHub source"
127139 echo " - Platforms: $PLATFORMS"
128- echo " - Commit Hash : $COMMIT_HASH"
140+ echo " - Image Tag Suffix : $COMMIT_HASH"
129141
130142 - name : Generate image tags
131143 id : generate-tags
@@ -159,7 +171,7 @@ jobs:
159171 build-args : |
160172 PYTHON_VERSION=${{ env.PYTHON_VERSION }}
161173 PYATLAN_VERSION=${{ env.PYATLAN_VERSION }}
162- PYATLAN_COMMIT_SHA=${{ env.COMMIT_HASH }}
174+ PYATLAN_COMMIT_SHA=${{ env.PYATLAN_COMMIT_SHA }}
163175 cache-from : type=gha
164176 cache-to : type=gha,mode=max
165177
@@ -173,11 +185,15 @@ jobs:
173185 echo "- **Build Type:** ${{ env.BUILD_TYPE }}" >> $GITHUB_STEP_SUMMARY
174186 echo "- **Build Method:** Multi-stage from GitHub source (no PyPI)" >> $GITHUB_STEP_SUMMARY
175187 echo "- **Python Version:** ${{ env.PYTHON_VERSION }}" >> $GITHUB_STEP_SUMMARY
176- echo "- **Pyatlan Version:** ${{ env.PYATLAN_VERSION }} (git tag v${{ env.PYATLAN_VERSION }})" >> $GITHUB_STEP_SUMMARY
188+ if [ -n "${{ env.PYATLAN_COMMIT_SHA }}" ]; then
189+ echo "- **Pyatlan Source:** Git commit/branch ${{ env.PYATLAN_COMMIT_SHA }}" >> $GITHUB_STEP_SUMMARY
190+ else
191+ echo "- **Pyatlan Source:** Git tag v${{ env.PYATLAN_VERSION }}" >> $GITHUB_STEP_SUMMARY
192+ fi
177193 echo "- **Dependencies:** Hardened from Chainguard APK + minimal pip" >> $GITHUB_STEP_SUMMARY
178194 echo "- **Platforms:** ${{ env.PLATFORMS }}" >> $GITHUB_STEP_SUMMARY
179195 if [ "${{ env.BUILD_TYPE }}" = "dev" ]; then
180- echo "- **Commit Hash :** ${{ env.COMMIT_HASH }}" >> $GITHUB_STEP_SUMMARY
196+ echo "- **Image Tag Suffix :** ${{ env.COMMIT_HASH }}" >> $GITHUB_STEP_SUMMARY
181197 fi
182198 echo "" >> $GITHUB_STEP_SUMMARY
183199 echo "### Available Tag:" >> $GITHUB_STEP_SUMMARY
0 commit comments