Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
dc4c5fdf8a
|
|||
|
96eb3e8185
|
|||
|
37bf443e29
|
@@ -35,8 +35,12 @@ jobs:
|
|||||||
|
|
||||||
TAGS="lerkolabs/uptop:${TAG}"
|
TAGS="lerkolabs/uptop:${TAG}"
|
||||||
TAGS="${TAGS},lerkolabs/uptop:sha-${SHORT_SHA}"
|
TAGS="${TAGS},lerkolabs/uptop:sha-${SHORT_SHA}"
|
||||||
|
# :latest only for real releases — rc rehearsal tags must not move it
|
||||||
if [ "${{ github.ref_type }}" = "tag" ]; then
|
if [ "${{ github.ref_type }}" = "tag" ]; then
|
||||||
TAGS="${TAGS},lerkolabs/uptop:latest"
|
case "$TAG" in
|
||||||
|
*-*) ;;
|
||||||
|
*) TAGS="${TAGS},lerkolabs/uptop:latest" ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
|
echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
@@ -52,6 +56,26 @@ jobs:
|
|||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
# Scan must gate the push: build amd64 locally, scan it, and only then run
|
||||||
|
# the multi-arch push (amd64 layers come from the builder cache, so the
|
||||||
|
# second build only adds the arm64 work).
|
||||||
|
- name: Build for scan (amd64, local)
|
||||||
|
uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
load: true
|
||||||
|
platforms: linux/amd64
|
||||||
|
tags: uptop-scan:${{ steps.meta.outputs.tag }}
|
||||||
|
build-args: |
|
||||||
|
VERSION=${{ steps.meta.outputs.tag }}
|
||||||
|
COMMIT=${{ github.sha }}
|
||||||
|
BUILD_DATE=${{ github.event.head_commit.timestamp }}
|
||||||
|
|
||||||
|
- name: Scan image for CVEs
|
||||||
|
run: |
|
||||||
|
curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b /usr/local/bin v0.114.0
|
||||||
|
grype uptop-scan:${{ steps.meta.outputs.tag }} --fail-on critical --output table
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
@@ -66,11 +90,6 @@ jobs:
|
|||||||
COMMIT=${{ github.sha }}
|
COMMIT=${{ github.sha }}
|
||||||
BUILD_DATE=${{ github.event.head_commit.timestamp }}
|
BUILD_DATE=${{ github.event.head_commit.timestamp }}
|
||||||
|
|
||||||
- name: Scan image for CVEs
|
|
||||||
run: |
|
|
||||||
curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b /usr/local/bin v0.114.0
|
|
||||||
grype lerkolabs/uptop:${{ steps.meta.outputs.tag }} --fail-on critical --output table
|
|
||||||
|
|
||||||
- name: Update Docker Hub description
|
- name: Update Docker Hub description
|
||||||
uses: peter-evans/dockerhub-description@v4
|
uses: peter-evans/dockerhub-description@v4
|
||||||
with:
|
with:
|
||||||
@@ -81,5 +100,7 @@ jobs:
|
|||||||
- name: Cleanup Docker artifacts
|
- name: Cleanup Docker artifacts
|
||||||
if: always()
|
if: always()
|
||||||
run: |
|
run: |
|
||||||
|
# the scan image is tagged, so image prune won't catch it
|
||||||
|
docker image rm "uptop-scan:${{ steps.meta.outputs.tag }}" 2>/dev/null || true
|
||||||
docker image prune -f
|
docker image prune -f
|
||||||
docker builder prune -f --keep-storage=2GB
|
docker builder prune -f --keep-storage=2GB
|
||||||
|
|||||||
@@ -19,22 +19,29 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
API="https://gitea.lerkolabs.com/api/v1/repos/lerkolabs/uptop/releases/tags/${TAG}"
|
API="https://gitea.lerkolabs.com/api/v1/repos/lerkolabs/uptop/releases/tags/${TAG}"
|
||||||
|
|
||||||
for i in $(seq 1 20); do
|
# 40 x 30s = 20 min: the Gitea release can queue behind the ~18-min
|
||||||
|
# Docker job on the single runner. Asset count must hold steady for
|
||||||
|
# two consecutive polls — GoReleaser uploads one file at a time, and
|
||||||
|
# mirroring mid-upload would publish a partial asset set.
|
||||||
|
PREV_COUNT=0
|
||||||
|
ASSET_COUNT=0
|
||||||
|
for i in $(seq 1 40); do
|
||||||
if RESPONSE=$(curl -sf "$API" 2>/dev/null); then
|
if RESPONSE=$(curl -sf "$API" 2>/dev/null); then
|
||||||
ASSET_COUNT=$(echo "$RESPONSE" | jq '.assets | length')
|
ASSET_COUNT=$(echo "$RESPONSE" | jq '.assets | length')
|
||||||
if [ "$ASSET_COUNT" -gt 0 ]; then
|
if [ "$ASSET_COUNT" -gt 0 ] && [ "$ASSET_COUNT" -eq "$PREV_COUNT" ]; then
|
||||||
echo "Found release with $ASSET_COUNT assets"
|
echo "Found release with $ASSET_COUNT assets (stable)"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
echo "Release exists but no assets yet... attempt $i/20"
|
echo "Release has $ASSET_COUNT assets (was $PREV_COUNT)... attempt $i/40"
|
||||||
|
PREV_COUNT="$ASSET_COUNT"
|
||||||
else
|
else
|
||||||
echo "Waiting for Gitea release... attempt $i/20"
|
echo "Waiting for Gitea release... attempt $i/40"
|
||||||
fi
|
fi
|
||||||
sleep 30
|
sleep 30
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -z "$RESPONSE" ] || [ "$ASSET_COUNT" -eq 0 ]; then
|
if [ -z "$RESPONSE" ] || [ "$ASSET_COUNT" -eq 0 ]; then
|
||||||
echo "::error::Gitea release for ${TAG} not found or has no assets after 10 minutes"
|
echo "::error::Gitea release for ${TAG} not found or has no assets after 20 minutes"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
+8
-3
@@ -1,6 +1,11 @@
|
|||||||
ignore:
|
ignore:
|
||||||
# CVE-2026-41589: SCP path traversal in charmbracelet/wish.
|
# SCP path traversal in charmbracelet/wish — same flaw, two ids: grype has
|
||||||
|
# matched it as CVE-2026-41589 and as GHSA-xjvp-7243-rg9h depending on db
|
||||||
|
# version, and ignore matching is exact-id, so both stay listed.
|
||||||
# We only import wish/bubbletea for the SSH TUI server — the vulnerable
|
# We only import wish/bubbletea for the SSH TUI server — the vulnerable
|
||||||
# scp.Middleware / scp.NewFileSystemHandler symbols are never compiled in.
|
# scp.Middleware / scp.NewFileSystemHandler symbols are never compiled in
|
||||||
# No fix available for wish v1; v2 (charm.land/wish/v2) patched in 2.0.1.
|
# (govulncheck reachability agrees). No fix for wish v1; v2
|
||||||
|
# (charm.land/wish/v2 >= 2.0.1) requires the bubbletea-v2 stack migration,
|
||||||
|
# tracked in issue #126. Remove both entries when that lands.
|
||||||
- vulnerability: CVE-2026-41589
|
- vulnerability: CVE-2026-41589
|
||||||
|
- vulnerability: GHSA-xjvp-7243-rg9h
|
||||||
|
|||||||
@@ -24,6 +24,10 @@ split_commits = false
|
|||||||
protect_breaking_commits = false
|
protect_breaking_commits = false
|
||||||
filter_commits = false
|
filter_commits = false
|
||||||
tag_pattern = "v[0-9].*"
|
tag_pattern = "v[0-9].*"
|
||||||
|
# rc tags are pipeline rehearsals, not releases — without this, the final
|
||||||
|
# tag's notes would only cover commits since the last rc (near-empty for
|
||||||
|
# v0.1.0). Ignored tags fold their commits into the next real release.
|
||||||
|
ignore_tags = "v.*-rc.*"
|
||||||
topo_order = false
|
topo_order = false
|
||||||
sort_commits = "oldest"
|
sort_commits = "oldest"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user