Skip to content

Commit c6b526c

Browse files
authored
Merge branch 'develop' into test/federation-integration
2 parents dd4cdae + de830b6 commit c6b526c

File tree

24 files changed

+1213
-197
lines changed

24 files changed

+1213
-197
lines changed

.changeset/kind-mangos-sit.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@rocket.chat/apps-engine': patch
3+
'@rocket.chat/meteor': patch
4+
---
5+
6+
Fixes the ping behavior so it only triggers when the app becomes idle, preventing unnecessary restarts

.github/actions/build-docker/action.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,26 @@ runs:
113113
114114
SERVICE_SUFFIX=${{ inputs.service == 'rocketchat' && inputs.type == 'coverage' && (github.event_name == 'release' || github.ref == 'refs/heads/develop') && '-cov' || '' }}
115115
116-
mkdir -p /tmp/digests/${{ inputs.service }}${SERVICE_SUFFIX}/${{ inputs.arch }}
116+
mkdir -p /tmp/manifests/${{ inputs.service }}${SERVICE_SUFFIX}/${{ inputs.arch }}
117+
118+
# Get digest and image info
117119
DIGEST=$(jq -r '.["${{ inputs.service }}"].["containerimage.digest"]' "/tmp/meta.json")
118-
IMAGE_NO_TAG=$(echo "$IMAGE" | sed 's/:.*$//')
119-
echo "${IMAGE_NO_TAG}@${DIGEST}" > "/tmp/digests/${{ inputs.service }}${SERVICE_SUFFIX}/${{ inputs.arch }}/digest.txt"
120+
IMAGE_NO_TAG=$(echo "$IMAGE" | sed 's/:.*$//')
121+
FULL_IMAGE="${IMAGE_NO_TAG}@${DIGEST}"
122+
123+
echo "Inspecting image: $FULL_IMAGE"
124+
125+
# Inspect the image and save complete manifest with sizes (using -v for verbose)
126+
docker manifest inspect -v "$FULL_IMAGE" > "/tmp/manifests/${{ inputs.service }}${SERVICE_SUFFIX}/${{ inputs.arch }}/manifest.json"
127+
128+
echo "Saved manifest to /tmp/manifests/${{ inputs.service }}${SERVICE_SUFFIX}/${{ inputs.arch }}/manifest.json"
129+
cat "/tmp/manifests/${{ inputs.service }}${SERVICE_SUFFIX}/${{ inputs.arch }}/manifest.json" | jq '.'
120130
121131
- uses: actions/upload-artifact@v4
122132
if: inputs.publish-image == 'true'
123133
with:
124-
name: digests-${{ inputs.service }}-${{ inputs.arch }}-${{ inputs.type }}
125-
path: /tmp/digests
134+
name: manifests-${{ inputs.service }}-${{ inputs.arch }}-${{ inputs.type }}
135+
path: /tmp/manifests
126136
retention-days: 5
127137

128138
- name: Clean up temporary files

0 commit comments

Comments
 (0)