mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-18 13:57:38 +00:00
test/images: Update npb-ep and npb-is base images to bookworm-slim
Debian stretch and buster have reached end of life and their package repositories are no longer available. Update the NAS Parallel Benchmarks images to use Debian bookworm-slim: - npb-is: stretch-slim -> bookworm-slim (version 1.2 -> 1.3) - npb-ep: buster-slim -> bookworm-slim (version 1.3 -> 1.4) For npb-ep, also remove the hardcoded buster apt sources and version-pinned packages that are no longer needed with bookworm. Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
linux/amd64=debian:buster-slim
|
||||
linux/arm64=arm64v8/debian:buster-slim
|
||||
linux/ppc64le=ppc64le/debian:buster-slim
|
||||
linux/s390x=s390x/debian:buster-slim
|
||||
linux/amd64=debian:bookworm-slim
|
||||
linux/arm64=arm64v8/debian:bookworm-slim
|
||||
linux/ppc64le=ppc64le/debian:bookworm-slim
|
||||
linux/s390x=s390x/debian:bookworm-slim
|
||||
|
||||
@@ -17,13 +17,7 @@ FROM $BASEIMAGE as build_node_perf_npb_ep
|
||||
|
||||
CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
|
||||
|
||||
RUN rm -f /etc/apt/sources.list
|
||||
RUN echo "deb [trusted=yes] http://archive.debian.org/debian buster main" >> /etc/apt/sources.list
|
||||
RUN echo "deb-src [trusted=yes] http://archive.debian.org/debian buster main" >> /etc/apt/sources.list
|
||||
RUN echo "deb [trusted=yes] http://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list
|
||||
RUN echo "deb-src [trusted=yes] http://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list
|
||||
|
||||
RUN apt-get update && apt-get install -y --allow-downgrades libbz2-1.0=1.0.6-9.2~deb10u1 libc6=2.28-10+deb10u1 libc6-dev g++ bzip2 dpkg-dev gfortran-8 build-essential gfortran
|
||||
RUN apt-get update && apt-get install -y libc6-dev g++ bzip2 dpkg-dev build-essential gfortran
|
||||
|
||||
ADD http://www.nas.nasa.gov/assets/npb/NPB3.4.3.tar.gz .
|
||||
RUN tar xzf NPB3.4.3.tar.gz
|
||||
|
||||
@@ -1 +1 @@
|
||||
1.3
|
||||
1.4
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
linux/amd64=debian:stretch-slim
|
||||
linux/arm64=arm64v8/debian:stretch-slim
|
||||
linux/ppc64le=ppc64le/debian:stretch-slim
|
||||
linux/s390x=s390x/debian:stretch-slim
|
||||
linux/amd64=debian:bookworm-slim
|
||||
linux/arm64=arm64v8/debian:bookworm-slim
|
||||
linux/ppc64le=ppc64le/debian:bookworm-slim
|
||||
linux/s390x=s390x/debian:bookworm-slim
|
||||
|
||||
@@ -1 +1 @@
|
||||
1.2
|
||||
1.3
|
||||
|
||||
Reference in New Issue
Block a user