|
39 | 39 | id: metadata |
40 | 40 | run: | |
41 | 41 | SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-7) |
42 | | - IMAGE_TAG="${GRAFANA_VERSION}-quickwit-0.6.0-patched-${SHORT_SHA}" |
| 42 | +
|
| 43 | + # Use git tag if available, otherwise use short SHA |
| 44 | + if git describe --exact-match --tags HEAD 2>/dev/null; then |
| 45 | + GIT_TAG=$(git describe --exact-match --tags HEAD) |
| 46 | + # Strip 'v' prefix if present |
| 47 | + VERSION=${GIT_TAG#v} |
| 48 | + IMAGE_TAG="${GRAFANA_VERSION}-quickwit-${VERSION}" |
| 49 | + else |
| 50 | + IMAGE_TAG="${GRAFANA_VERSION}-quickwit-0.6.0-patched-${SHORT_SHA}" |
| 51 | + fi |
43 | 52 |
|
44 | 53 | echo "githash=${{ github.sha }}" >> $GITHUB_OUTPUT |
45 | 54 | echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT |
@@ -141,23 +150,24 @@ jobs: |
141 | 150 | github.event_name == 'workflow_dispatch' && github.event.inputs.force_publish == 'true' || |
142 | 151 | github.event.action == 'closed' && github.event.pull_request.merged == true || |
143 | 152 | github.ref == 'refs/heads/main' || |
144 | | - github.ref == 'refs/heads/disable-field-caps-all-fields' |
| 153 | + github.ref == 'refs/heads/disable-field-caps-all-fields' || |
| 154 | + startsWith(github.ref, 'refs/tags/') |
145 | 155 | run: | |
146 | 156 | aws ecr get-login-password --region $AWS_REGION_MGT | docker login --username AWS --password-stdin $DOCKER_REGISTRY_MGT |
147 | 157 |
|
148 | 158 | docker tag ${{ env.ECR_REPOSITORY }}:${{ steps.metadata.outputs.image_tag }} \ |
149 | 159 | $DOCKER_REGISTRY_MGT/${{ env.ECR_REPOSITORY }}:${{ steps.metadata.outputs.image_tag }} |
150 | 160 |
|
151 | | - docker tag ${{ env.ECR_REPOSITORY }}:latest \ |
152 | | - $DOCKER_REGISTRY_MGT/${{ env.ECR_REPOSITORY }}:latest |
153 | | -
|
154 | 161 | docker push $DOCKER_REGISTRY_MGT/${{ env.ECR_REPOSITORY }}:${{ steps.metadata.outputs.image_tag }} |
155 | | - docker push $DOCKER_REGISTRY_MGT/${{ env.ECR_REPOSITORY }}:latest |
156 | 162 |
|
157 | 163 | SUMMARY=$'# Published Grafana Quickwit Image to ECR\n' |
158 | | - SUMMARY+=$'## Images\n' |
159 | | - SUMMARY+=$'* '"$DOCKER_REGISTRY_MGT"'/${{ env.ECR_REPOSITORY }}:'"${{ steps.metadata.outputs.image_tag }}"$'\n' |
160 | | - SUMMARY+=$'* '"$DOCKER_REGISTRY_MGT"'/${{ env.ECR_REPOSITORY }}:latest'$'\n' |
| 164 | + SUMMARY+=$'## Image\n' |
| 165 | + SUMMARY+=$'```\n' |
| 166 | + SUMMARY+=$''$DOCKER_REGISTRY_MGT'/${{ env.ECR_REPOSITORY }}:${{ steps.metadata.outputs.image_tag }}\n' |
| 167 | + SUMMARY+=$'```\n' |
| 168 | + SUMMARY+=$'\n## Usage in Deployments\n' |
| 169 | + SUMMARY+=$'**Preprod**: Update gitops to use this tag for testing\n' |
| 170 | + SUMMARY+=$'**Prod**: Promote this tag after preprod validation\n' |
161 | 171 | SUMMARY+=$'\n## Details\n' |
162 | 172 | SUMMARY+=$'* **Grafana Version**: ${{ env.GRAFANA_VERSION }}\n' |
163 | 173 | SUMMARY+=$'* **Quickwit Plugin**: 0.6.0-patched (field_caps disabled)\n' |
|
0 commit comments