@@ -137,9 +137,7 @@ RUN clean-install \
137137 gnupg \
138138 sudo \
139139 openssh-server \
140- dnsutils \
141- # libglib2.0-0 is required for conmon, which is required for podman
142- libglib2.0-0
140+ dnsutils
143141
144142# Add support for rsa1 in sshd
145143# modern debian-based OSs dont support rsa1 by default, so we need to enable it to support older ssh clients
@@ -194,7 +192,7 @@ RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/
194192 && systemctl enable buildkit.socket
195193
196194# install podman
197- RUN clean-install podman && \
195+ RUN clean-install podman catatonit crun && \
198196 addgroup --system podman && \
199197 mkdir -p /etc/systemd/system/podman.socket.d && \
200198 printf "[Socket]\n SocketMode=0660\n SocketUser=root\n SocketGroup=podman\n " \
@@ -222,17 +220,6 @@ RUN export ARCH=$(dpkg --print-architecture) && \
222220 else \
223221 echo "Skipping crictl install for armhf: No asset available in v1.34.0" ; \
224222 fi
225- # install cri-o dependencies:
226- RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' ) && \
227- mkdir -p /etc/apt/keyrings && \
228- curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_12/Release.key | \
229- gpg --dearmor --yes -o /etc/apt/keyrings/libcontainers-archive-keyring.gpg && \
230- sh -c "echo 'deb [signed-by=/etc/apt/keyrings/libcontainers-archive-keyring.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_12/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
231- if [ "$ARCH" != "ppc64le" ]; then \
232- clean-install catatonit crun; \
233- else \
234- clean-install crun; \
235- fi
236223# install containernetworking-plugins
237224RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm/' ) && \
238225 curl -LO "https://github.com/containernetworking/plugins/releases/download/${CNI_PLUGINS_VERSION}/cni-plugins-linux-$ARCH-${CNI_PLUGINS_VERSION}.tgz" && \
0 commit comments