install v1.3.0 instead of v1.4.2 to avoid libc6 version conflic

microsoft · Apr 10, 2024 · 771719d · 771719d
1 parent 008a89d
commit 771719d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.docker/ubuntu-20.04/Dockerfile b/.docker/ubuntu-20.04/Dockerfile
@@ -13,7 +13,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
     wget && \
     wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
     apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' && \
-    apt-add-repository "deb http://mirrors.kernel.org/ubuntu noble main" -y && \
     apt-add-repository ppa:lttng/stable-2.13 && \
     apt-get update && apt-get install -y tzdata && apt-get install -y \
     build-essential \
@@ -40,8 +39,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
     cppcheck \
     clang-tidy \
     gdb \
-    libxdp-dev \
-    libbpf-dev \
     libnl-3-dev \
     libnl-genl-3-dev \
     libnl-route-3-dev \
@@ -88,5 +85,12 @@ RUN apt-get install --no-install-recommends -y liblttng-ust-dev:arm64 \
     libnuma-dev:armhf \
     && rm -rf /var/lib/apt/lists/*
 
+# install v1.3.0. v1.4.0 cause libc6 conflicts with arm packages
+RUN echo "deb [arch=amd64] http://cz.archive.ubuntu.com/ubuntu mantic main" > /etc/apt/sources.list.d/mantic.list && \
+    apt-get update && apt-get install -y -t mantic \
+    libxdp-dev:amd64 \
+    libbpf-dev:amd64 \
+    && rm -rf /var/lib/apt/lists/*
+
 RUN git config --global safe.directory '*'
 
diff --git a/.docker/ubuntu-22.04/Dockerfile b/.docker/ubuntu-22.04/Dockerfile
@@ -13,7 +13,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
     wget && \
     wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
     apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main' && \
-    apt-add-repository "deb http://mirrors.kernel.org/ubuntu noble main" -y && \
     apt-add-repository ppa:lttng/stable-2.13 && \
     apt-get update && apt-get install -y tzdata && apt-get install -y \
     build-essential \
@@ -40,8 +39,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
     cppcheck \
     clang-tidy \
     gdb \
-    libxdp-dev \
-    libbpf-dev \
     libnl-3-dev \
     libnl-genl-3-dev \
     libnl-route-3-dev \
@@ -87,4 +84,11 @@ RUN apt-get --no-install-recommends install -y liblttng-ust-dev:arm64 \
     libnuma-dev:armhf \
     && rm -rf /var/lib/apt/lists/*
 
+# install v1.3.0. v1.4.0 cause libc6 conflicts with arm packages
+RUN echo "deb [arch=amd64] http://cz.archive.ubuntu.com/ubuntu mantic main" > /etc/apt/sources.list.d/mantic.list && \
+    apt-get update && apt-get install -y -t mantic \
+    libxdp-dev:amd64 \
+    libbpf-dev:amd64 \
+    && rm -rf /var/lib/apt/lists/*
+
 RUN git config --global safe.directory '*'