update prow image (#20626)
parent
fe470c1679
commit
0e6675c48c
|
@ -15,7 +15,7 @@
|
|||
# Includes tools used for kubernetes/minikube CI
|
||||
# NOTE: we attempt to avoid unnecessary tools and image layers while
|
||||
# supporting kubernetes builds, minikube installation, etc.
|
||||
FROM debian:bullseye
|
||||
FROM debian:bookworm
|
||||
|
||||
# arg that specifies the go version to install
|
||||
ARG GO_VERSION
|
||||
|
@ -37,27 +37,27 @@ ENV GOPATH=/home/prow/go \
|
|||
# the pod logs, so we just comment out the call to it... :shrug:
|
||||
RUN export ARCH=$(dpkg --print-architecture) \
|
||||
&& echo "Installing Packages ..." \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apt-transport-https \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
curl \
|
||||
file \
|
||||
git \
|
||||
gnupg2 \
|
||||
kmod \
|
||||
lsb-release \
|
||||
mercurial \
|
||||
pkg-config \
|
||||
procps \
|
||||
python \
|
||||
python-dev \
|
||||
python3-pip \
|
||||
rsync \
|
||||
software-properties-common \
|
||||
unzip \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apt-transport-https \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
curl \
|
||||
file \
|
||||
git \
|
||||
gnupg \
|
||||
kmod \
|
||||
lsb-release \
|
||||
mercurial \
|
||||
pkg-config \
|
||||
procps \
|
||||
python3 \
|
||||
python3-dev \
|
||||
python3-pip \
|
||||
rsync \
|
||||
software-properties-common \
|
||||
unzip \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& echo "Installing Go ..." \
|
||||
&& export GO_TARBALL="go${GO_VERSION}.linux-${ARCH}.tar.gz"\
|
||||
&& curl -fsSL "https://storage.googleapis.com/golang/${GO_TARBALL}" --output "${GO_TARBALL}" \
|
||||
|
@ -65,12 +65,19 @@ RUN export ARCH=$(dpkg --print-architecture) \
|
|||
&& rm "${GO_TARBALL}"\
|
||||
&& mkdir -p "${GOPATH}/bin" \
|
||||
&& echo "Installing Docker ..." \
|
||||
&& curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | apt-key add - \
|
||||
&& add-apt-repository \
|
||||
"deb [arch="$(dpkg --print-architecture)"] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
|
||||
$(lsb_release -cs) stable" \
|
||||
&& install -m 0755 -d /etc/apt/keyrings \
|
||||
&& curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
|
||||
&& chmod a+r /etc/apt/keyrings/docker.gpg \
|
||||
&& echo \
|
||||
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
|
||||
bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends docker-ce \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
docker-ce \
|
||||
docker-ce-cli \
|
||||
containerd.io \
|
||||
docker-buildx-plugin \
|
||||
docker-compose-plugin \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& sed -i 's/cgroupfs_mount$/#cgroupfs_mount\n/' /etc/init.d/docker \
|
||||
&& echo "Ensuring Legacy Iptables ..." \
|
||||
|
@ -79,7 +86,7 @@ RUN export ARCH=$(dpkg --print-architecture) \
|
|||
&& echo "Installing Kubectl ..." \
|
||||
&& curl -LO "https://dl.k8s.io/$(curl -sSL https://dl.k8s.io/release/stable.txt)/bin/linux/${ARCH}/kubectl" \
|
||||
&& chmod +x ./kubectl \
|
||||
&& cp kubectl /usr/local/bin
|
||||
&& cp kubectl /usr/local/bin
|
||||
# copy in image utility scripts
|
||||
COPY wrapper.sh /usr/local/bin/
|
||||
# entrypoint is our wrapper script, in Prow you will need to explicitly re-specify this
|
||||
|
|
Loading…
Reference in New Issue