From fc7efa0bf70090052e2bdf4f4737c86ec23bc4f0 Mon Sep 17 00:00:00 2001 From: Yi Huang Date: Thu, 28 Aug 2025 10:26:47 -0700 Subject: [PATCH 1/8] Update base image SHA for Ubuntu 24.04 --- .docker/ubuntu-24.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/ubuntu-24.04/Dockerfile b/.docker/ubuntu-24.04/Dockerfile index 8ac389ee74..7666ba92b4 100644 --- a/.docker/ubuntu-24.04/Dockerfile +++ b/.docker/ubuntu-24.04/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Base image -FROM ubuntu:24.04@sha256:c4570d2f4665d5d118ae29fb494dee4f8db8fcfaee0e37a2e19b827f399070d3 AS base +FROM ubuntu:24.04@sha256:7c06e91f61fa88c08cc74f7e1b7c69ae24910d745357e0dfe1d2c0322aaf20f9 AS base LABEL org.opencontainers.image.source https://github.com/microsoft/msquic From 0f46f1b98dd8923eb8486408bab10caae4eb63a9 Mon Sep 17 00:00:00 2001 From: Yi Huang Date: Thu, 28 Aug 2025 10:30:28 -0700 Subject: [PATCH 2/8] Update Dockerfile to remove image digest --- .docker/ubuntu-24.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/ubuntu-24.04/Dockerfile b/.docker/ubuntu-24.04/Dockerfile index 7666ba92b4..c37df5962e 100644 --- a/.docker/ubuntu-24.04/Dockerfile +++ b/.docker/ubuntu-24.04/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Base image -FROM ubuntu:24.04@sha256:7c06e91f61fa88c08cc74f7e1b7c69ae24910d745357e0dfe1d2c0322aaf20f9 AS base +FROM ubuntu:24.04 AS base LABEL org.opencontainers.image.source https://github.com/microsoft/msquic From 232f2700f8ba0505866a4b11e6bb3629d0236be0 Mon Sep 17 00:00:00 2001 From: Yi Huang Date: Thu, 28 Aug 2025 10:30:49 -0700 Subject: [PATCH 3/8] Update Dockerfile --- .docker/ubuntu-22.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/ubuntu-22.04/Dockerfile b/.docker/ubuntu-22.04/Dockerfile index 3e3095464f..298b27ddba 100644 --- a/.docker/ubuntu-22.04/Dockerfile +++ b/.docker/ubuntu-22.04/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Base image -FROM ubuntu:22.04@sha256:59ccd419c0dc0edf9e3bff1a3b2b073ea15a2ce4bc45ce7c989278b225b09af3 AS base +FROM ubuntu:22.04 AS base LABEL org.opencontainers.image.source https://github.com/microsoft/msquic From 8fd57d81ac685db05ca079c56d44b645007e6e71 Mon Sep 17 00:00:00 2001 From: Yi Huang Date: Thu, 28 Aug 2025 10:47:34 -0700 Subject: [PATCH 4/8] Add support for Ubuntu 24.04 in Dependabot config --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 87cdf89708..75a6025006 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -35,8 +35,8 @@ updates: - package-ecosystem: "docker" directories: - - "/.docker/ubuntu-20.04" - "/.docker/ubuntu-22.04" + - "/.docker/ubuntu-24.04" schedule: interval: "weekly" day: "saturday" From 5fb2a3a261aeda41910d80247bd4558b6508ff1f Mon Sep 17 00:00:00 2001 From: Yi Huang Date: Thu, 28 Aug 2025 10:48:15 -0700 Subject: [PATCH 5/8] Use specific image digest for Ubuntu 22.04 --- .docker/ubuntu-22.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/ubuntu-22.04/Dockerfile b/.docker/ubuntu-22.04/Dockerfile index 298b27ddba..3e3095464f 100644 --- a/.docker/ubuntu-22.04/Dockerfile +++ b/.docker/ubuntu-22.04/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Base image -FROM ubuntu:22.04 AS base +FROM ubuntu:22.04@sha256:59ccd419c0dc0edf9e3bff1a3b2b073ea15a2ce4bc45ce7c989278b225b09af3 AS base LABEL org.opencontainers.image.source https://github.com/microsoft/msquic From d1223b5951a1b6be4fcd23603bdb58d7e7311f66 Mon Sep 17 00:00:00 2001 From: Yi Huang Date: Thu, 28 Aug 2025 10:48:40 -0700 Subject: [PATCH 6/8] Update Dockerfile to use specific Ubuntu image SHA --- .docker/ubuntu-24.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/ubuntu-24.04/Dockerfile b/.docker/ubuntu-24.04/Dockerfile index c37df5962e..7666ba92b4 100644 --- a/.docker/ubuntu-24.04/Dockerfile +++ b/.docker/ubuntu-24.04/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Base image -FROM ubuntu:24.04 AS base +FROM ubuntu:24.04@sha256:7c06e91f61fa88c08cc74f7e1b7c69ae24910d745357e0dfe1d2c0322aaf20f9 AS base LABEL org.opencontainers.image.source https://github.com/microsoft/msquic From 6a80508bf7ace2cb37c95d375c809c1ce743e368 Mon Sep 17 00:00:00 2001 From: Yi Huang Date: Thu, 28 Aug 2025 10:50:00 -0700 Subject: [PATCH 7/8] Fix formatting of Dockerfile base image line --- .docker/ubuntu-24.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/ubuntu-24.04/Dockerfile b/.docker/ubuntu-24.04/Dockerfile index 7666ba92b4..02b70e9fa5 100644 --- a/.docker/ubuntu-24.04/Dockerfile +++ b/.docker/ubuntu-24.04/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Base image -FROM ubuntu:24.04@sha256:7c06e91f61fa88c08cc74f7e1b7c69ae24910d745357e0dfe1d2c0322aaf20f9 AS base +FROM ubuntu:24.04@sha256:7c06e91f61fa88c08cc74f7e1b7c69ae24910d745357e0dfe1d2c0322aaf20f9 AS base LABEL org.opencontainers.image.source https://github.com/microsoft/msquic From 2f55c072210fbd94af02d5b9249fe8a4a066eac7 Mon Sep 17 00:00:00 2001 From: Yi Huang Date: Thu, 28 Aug 2025 11:00:56 -0700 Subject: [PATCH 8/8] Update Docker directories for Dependabot configuration --- .github/dependabot.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 75a6025006..96f724ac26 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -35,8 +35,7 @@ updates: - package-ecosystem: "docker" directories: - - "/.docker/ubuntu-22.04" - - "/.docker/ubuntu-24.04" + - "/.docker/*" schedule: interval: "weekly" day: "saturday"