From 15a210a8b7bfc31e50893a002edec9dc8c67e0a8 Mon Sep 17 00:00:00 2001 From: Kaido Kert Date: Wed, 22 Nov 2023 14:15:25 -0800 Subject: [PATCH] Change base image to Debian 11 This updates base runner images to Debian11. Also update leak check manifests to match. b/312772759 --- .github/workflows/stub.yaml | 2 +- docker/linux/base/Dockerfile | 2 +- ...an10_manifest => gn_built_docker_debian11_manifest} | 10 +++++----- ...an10_manifest => gn_built_docker_debian11_manifest} | 8 +++++--- ...an10_manifest => gn_built_docker_debian11_manifest} | 8 +++++--- ...an10_manifest => gn_built_docker_debian11_manifest} | 8 +++++--- 6 files changed, 22 insertions(+), 16 deletions(-) rename starboard/tools/api_leak_detector/stub/debug/{gn_built_docker_debian10_manifest => gn_built_docker_debian11_manifest} (97%) rename starboard/tools/api_leak_detector/stub/devel/{gn_built_docker_debian10_manifest => gn_built_docker_debian11_manifest} (97%) rename starboard/tools/api_leak_detector/stub/gold/{gn_built_docker_debian10_manifest => gn_built_docker_debian11_manifest} (97%) rename starboard/tools/api_leak_detector/stub/qa/{gn_built_docker_debian10_manifest => gn_built_docker_debian11_manifest} (97%) diff --git a/.github/workflows/stub.yaml b/.github/workflows/stub.yaml index b5953b955fb7..4747ba50250c 100644 --- a/.github/workflows/stub.yaml +++ b/.github/workflows/stub.yaml @@ -28,4 +28,4 @@ jobs: platform: stub nightly: ${{ github.event.inputs.nightly }} run_api_leak_detector: true - leak_manifest_filename: "gn_built_docker_debian10_manifest" + leak_manifest_filename: "gn_built_docker_debian11_manifest" diff --git a/docker/linux/base/Dockerfile b/docker/linux/base/Dockerfile index 2ea99ed7b446..16f060aec3aa 100644 --- a/docker/linux/base/Dockerfile +++ b/docker/linux/base/Dockerfile @@ -14,7 +14,7 @@ ARG BASE_OS ARG BASE_OS_TAG -FROM ${BASE_OS:-gcr.io/cloud-marketplace-containers/google/debian10}:${BASE_OS_TAG:-latest} +FROM ${BASE_OS:-gcr.io/cloud-marketplace-containers/google/debian11}:${BASE_OS_TAG:-latest} COPY base/clean-after-apt.sh /opt/clean-after-apt.sh diff --git a/starboard/tools/api_leak_detector/stub/debug/gn_built_docker_debian10_manifest b/starboard/tools/api_leak_detector/stub/debug/gn_built_docker_debian11_manifest similarity index 97% rename from starboard/tools/api_leak_detector/stub/debug/gn_built_docker_debian10_manifest rename to starboard/tools/api_leak_detector/stub/debug/gn_built_docker_debian11_manifest index ca59f7f776d7..3ea57d1c78c5 100644 --- a/starboard/tools/api_leak_detector/stub/debug/gn_built_docker_debian10_manifest +++ b/starboard/tools/api_leak_detector/stub/debug/gn_built_docker_debian11_manifest @@ -30,10 +30,6 @@ __errno_location __freelocale __fxstat64 __gmon_start__ -__isinf -__isinff -__isinfl -__isnan __isoc99_sscanf __iswctype_l __libc_start_main @@ -59,13 +55,13 @@ abort bind_textdomain_codeset bindtextdomain btowc +close dgettext exit fclose fdopen fflush fileno -fopen fopen64 fprintf fputc @@ -79,6 +75,9 @@ gettext getwc htonl htons +iconv +iconv_close +iconv_open ioctl isalpha isprint @@ -90,6 +89,7 @@ mbsnrtowcs mbsrtowcs ntohl ntohs +open poll printf pthread_cond_broadcast diff --git a/starboard/tools/api_leak_detector/stub/devel/gn_built_docker_debian10_manifest b/starboard/tools/api_leak_detector/stub/devel/gn_built_docker_debian11_manifest similarity index 97% rename from starboard/tools/api_leak_detector/stub/devel/gn_built_docker_debian10_manifest rename to starboard/tools/api_leak_detector/stub/devel/gn_built_docker_debian11_manifest index 68a9f109a1df..7a744c30a905 100644 --- a/starboard/tools/api_leak_detector/stub/devel/gn_built_docker_debian10_manifest +++ b/starboard/tools/api_leak_detector/stub/devel/gn_built_docker_debian11_manifest @@ -31,8 +31,6 @@ __errno_location __freelocale __fxstat64 __gmon_start__ -__isinf -__isnan __isoc99_sscanf __iswctype_l __libc_start_main @@ -59,13 +57,13 @@ bcmp bind_textdomain_codeset bindtextdomain btowc +close dgettext exit fclose fdopen fflush fileno -fopen fopen64 fprintf fputc @@ -77,6 +75,9 @@ fwrite getc gettext getwc +iconv +iconv_close +iconv_open ioctl isalpha isprint @@ -87,6 +88,7 @@ mbrtowc mbsnrtowcs mbsrtowcs memrchr +open poll printf pthread_cond_broadcast diff --git a/starboard/tools/api_leak_detector/stub/gold/gn_built_docker_debian10_manifest b/starboard/tools/api_leak_detector/stub/gold/gn_built_docker_debian11_manifest similarity index 97% rename from starboard/tools/api_leak_detector/stub/gold/gn_built_docker_debian10_manifest rename to starboard/tools/api_leak_detector/stub/gold/gn_built_docker_debian11_manifest index 55e4d1fecf77..2469c4e52540 100644 --- a/starboard/tools/api_leak_detector/stub/gold/gn_built_docker_debian10_manifest +++ b/starboard/tools/api_leak_detector/stub/gold/gn_built_docker_debian11_manifest @@ -30,8 +30,6 @@ __errno_location __freelocale __fxstat64 __gmon_start__ -__isinf -__isnan __isoc99_sscanf __iswctype_l __libc_start_main @@ -58,13 +56,13 @@ bcmp bind_textdomain_codeset bindtextdomain btowc +close dgettext exit fclose fdopen fflush fileno -fopen fopen64 fprintf fputc @@ -76,6 +74,9 @@ fwrite getc gettext getwc +iconv +iconv_close +iconv_open ioctl isalpha isprint @@ -86,6 +87,7 @@ mbrtowc mbsnrtowcs mbsrtowcs memrchr +open poll printf pthread_cond_broadcast diff --git a/starboard/tools/api_leak_detector/stub/qa/gn_built_docker_debian10_manifest b/starboard/tools/api_leak_detector/stub/qa/gn_built_docker_debian11_manifest similarity index 97% rename from starboard/tools/api_leak_detector/stub/qa/gn_built_docker_debian10_manifest rename to starboard/tools/api_leak_detector/stub/qa/gn_built_docker_debian11_manifest index 55e4d1fecf77..2469c4e52540 100644 --- a/starboard/tools/api_leak_detector/stub/qa/gn_built_docker_debian10_manifest +++ b/starboard/tools/api_leak_detector/stub/qa/gn_built_docker_debian11_manifest @@ -30,8 +30,6 @@ __errno_location __freelocale __fxstat64 __gmon_start__ -__isinf -__isnan __isoc99_sscanf __iswctype_l __libc_start_main @@ -58,13 +56,13 @@ bcmp bind_textdomain_codeset bindtextdomain btowc +close dgettext exit fclose fdopen fflush fileno -fopen fopen64 fprintf fputc @@ -76,6 +74,9 @@ fwrite getc gettext getwc +iconv +iconv_close +iconv_open ioctl isalpha isprint @@ -86,6 +87,7 @@ mbrtowc mbsnrtowcs mbsrtowcs memrchr +open poll printf pthread_cond_broadcast