This commit is contained in:
+41
-16
@@ -55,7 +55,13 @@ function parseImage(fullImage: string): { registry: string; name: string; tag: s
|
||||
return { registry, name, tag }
|
||||
}
|
||||
|
||||
async function getRegistryToken(image: string): Promise<string> {
|
||||
const MANIFEST_ACCEPT = [
|
||||
'application/vnd.docker.distribution.manifest.v2+json',
|
||||
'application/vnd.docker.distribution.manifest.list.v2+json',
|
||||
'application/vnd.oci.image.index.v1+json',
|
||||
].join(', ')
|
||||
|
||||
async function getDockerHubToken(image: string): Promise<string> {
|
||||
const res = await axios.get(
|
||||
`https://auth.docker.io/token?service=registry.docker.io&scope=repository:${image}:pull`,
|
||||
{ timeout: 8000 }
|
||||
@@ -69,27 +75,42 @@ async function getLatestDigest(image: string, tag: string): Promise<string | nul
|
||||
if (cached) return cached
|
||||
|
||||
try {
|
||||
const token = await getRegistryToken(image)
|
||||
const token = await getDockerHubToken(image)
|
||||
const res = await axios.head(
|
||||
`https://registry-1.docker.io/v2/${image}/manifests/${tag}`,
|
||||
{
|
||||
headers: {
|
||||
Authorization: `Bearer ${token}`,
|
||||
Accept: [
|
||||
'application/vnd.docker.distribution.manifest.v2+json',
|
||||
'application/vnd.docker.distribution.manifest.list.v2+json',
|
||||
'application/vnd.oci.image.index.v1+json',
|
||||
].join(', '),
|
||||
},
|
||||
timeout: 10000,
|
||||
}
|
||||
{ headers: { Authorization: `Bearer ${token}`, Accept: MANIFEST_ACCEPT }, timeout: 10000 }
|
||||
)
|
||||
const digest = res.headers['docker-content-digest'] as string | undefined
|
||||
if (digest) toCache(cacheKey, digest)
|
||||
return digest ?? null
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
} catch { return null }
|
||||
}
|
||||
|
||||
async function getGhcrLatestDigest(image: string, tag: string): Promise<string | null> {
|
||||
const cacheKey = `ghcr:${image}:${tag}`
|
||||
const cached = fromCache<string>(cacheKey, HUB_TTL)
|
||||
if (cached) return cached
|
||||
|
||||
try {
|
||||
const ghToken = process.env.GITHUB_TOKEN
|
||||
const authHeaders: Record<string, string> = ghToken
|
||||
? { Authorization: `Bearer ${ghToken}` }
|
||||
: {}
|
||||
|
||||
const tokenRes = await axios.get(
|
||||
`https://ghcr.io/token?service=ghcr.io&scope=repository:${image}:pull`,
|
||||
{ headers: authHeaders, timeout: 8000 }
|
||||
)
|
||||
const token = tokenRes.data.token as string
|
||||
|
||||
const res = await axios.head(
|
||||
`https://ghcr.io/v2/${image}/manifests/${tag}`,
|
||||
{ headers: { Authorization: `Bearer ${token}`, Accept: MANIFEST_ACCEPT }, timeout: 10000 }
|
||||
)
|
||||
const digest = res.headers['docker-content-digest'] as string | undefined
|
||||
if (digest) toCache(cacheKey, digest)
|
||||
return digest ?? null
|
||||
} catch { return null }
|
||||
}
|
||||
|
||||
router.get('/docker', async (_req, res) => {
|
||||
@@ -136,11 +157,15 @@ router.get('/docker', async (_req, res) => {
|
||||
|
||||
const { registry, name, tag } = parseImage(rawImage)
|
||||
const isDockerHub = registry === 'docker.io'
|
||||
const isGhcr = registry === 'ghcr.io'
|
||||
|
||||
let upToDate: boolean | null = null
|
||||
if (isDockerHub && repoDigest) {
|
||||
const latest = await getLatestDigest(name, tag)
|
||||
if (latest) upToDate = latest === repoDigest
|
||||
} else if (isGhcr && repoDigest) {
|
||||
const latest = await getGhcrLatestDigest(name, tag)
|
||||
if (latest) upToDate = latest === repoDigest
|
||||
}
|
||||
|
||||
containers.push({
|
||||
|
||||
@@ -26,7 +26,7 @@ export function DockerUpdatesWidget() {
|
||||
}, [])
|
||||
|
||||
const outdated = containers.filter(c => c.upToDate === false).length
|
||||
const unknown = containers.filter(c => c.upToDate === null).length
|
||||
const unknown = containers.filter(c => c.upToDate === null && c.registry !== 'docker.io' && c.registry !== 'ghcr.io').length
|
||||
|
||||
return (
|
||||
<div className="card">
|
||||
@@ -52,7 +52,7 @@ export function DockerUpdatesWidget() {
|
||||
{c.image}:{c.tag} · {c.endpoint}
|
||||
</span>
|
||||
</div>
|
||||
{c.registry !== 'docker.io' ? (
|
||||
{c.upToDate === null && c.registry !== 'docker.io' && c.registry !== 'ghcr.io' ? (
|
||||
<span className="pill pill-blue">ext</span>
|
||||
) : c.upToDate === true ? (
|
||||
<span className="pill pill-green">✓</span>
|
||||
|
||||
Reference in New Issue
Block a user