cos-kernel-kdev: fix the module build on M101
After last upgrade to the latest CrOS chroot version, the module
build stopped working because fixdep tool bundled with the headers
package now requires GLIBC_2.33 symbols.
Version 21.10 was picked because the 22.04 LTS includes clone3 syscall
that is not handled by the defaul seccomp profile in older Docker
versions: https://github.com/moby/moby/pull/42681
Change-Id: Ib44d20a4d1e47198052d8d9a0817801f40c26aa1
Reviewed-on: https://cos-review.googlesource.com/c/cos/tools/+/33320
Reviewed-by: Meena Shanmugam <meenashanmugam@google.com>
Cloud-Build: GCB Service account <228075978874@cloudbuild.gserviceaccount.com>
Tested-by: Oleksandr Tymoshenko <ovt@google.com>
diff --git a/src/cmd/cos_kernel_devenv/Dockerfile b/src/cmd/cos_kernel_devenv/Dockerfile
index 0e5cfb9..d80bea4 100644
--- a/src/cmd/cos_kernel_devenv/Dockerfile
+++ b/src/cmd/cos_kernel_devenv/Dockerfile
@@ -1,14 +1,16 @@
-# Start from google/cloud-sdk:slim base.
-FROM google/cloud-sdk:slim
+FROM ubuntu:21.10
-RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/buster-backports.list
-RUN apt-get update && apt-get install -y make gcc git libssl-dev bc bison flex cpio kmod cmake \
- libdw1/buster-backports libdw-dev/buster-backports libelf-dev/buster-backports && \
- git clone --depth 1 -b v1.17 https://git.kernel.org/pub/scm/devel/pahole/pahole.git /tmp/pahole && \
- cd /tmp/pahole && \
- cmake -D__LIB=lib -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE="None" -DLIBBPF_EMBEDDED=off . && \
- make -C /tmp/pahole install && cd - && rm -rf /tmp/pahole && \
- apt-get clean
+RUN apt-get -y update && \
+ apt-get -y install apt-transport-https ca-certificates gnupg curl && \
+ echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" \
+ > /etc/apt/sources.list.d/google-cloud-sdk.list && \
+ curl -o /usr/share/keyrings/cloud.google.gpg \
+ https://packages.cloud.google.com/apt/doc/apt-key.gpg && \
+ apt-get update -y && \
+ DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y tzdata && \
+ apt-get install -y make python3 git libssl-dev bc bison flex cpio kmod \
+ dwarves google-cloud-cli xz-utils libelf-dev && \
+ apt-get clean
COPY ./devenv.sh /devenv.sh
