remove containers-common

kubernetes · Apr 13, 2023 · 9f14d9b · 9f14d9b
1 parent a80a9bf
commit 9f14d9b
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile
@@ -144,7 +144,7 @@ RUN clean-install \
 # install docker
 # use the bionic packages for arm32
 RUN export ARCH=$(dpkg --print-architecture | sed 's/armhf/arm-v7/') && \
-    if [ "$ARCH" == "arm-v7" ]; then export DIST="bionic"; else export DIST="focal"; fi && \
+    if [ "$ARCH" == "arm-v7" ]; then export DIST="bionic"; else export DIST="jammy"; fi && \
     sh -c "echo 'deb https://download.docker.com/linux/ubuntu ${DIST} stable' > /etc/apt/sources.list.d/docker.list" && \
     curl -L https://download.docker.com/linux/ubuntu/gpg -o docker.key && \
     apt-key add - < docker.key && \
@@ -186,9 +186,9 @@ RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/') && \
     curl -LO https://downloadcontent.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_22.04/Release.key && \
     apt-key add - < Release.key && \
     if [ "$ARCH" != "ppc64le" ]; then \
-        clean-install containers-common catatonit conmon containernetworking-plugins cri-tools  crun; \
+        clean-install catatonit conmon containernetworking-plugins cri-tools  crun; \
     else \
-       	clean-install containers-common conmon containernetworking-plugins crun; \
+        clean-install conmon containernetworking-plugins crun; \
     fi
 
 # install cri-o based on https://github.com/cri-o/cri-o/blob/release-1.24/README.md#installing-cri-o
@@ -229,10 +229,6 @@ RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
 # minikube relies on /etc/hosts for control-plane discovery. This prevents nefarious DNS servers from breaking it.
 RUN sed -ri 's/dns files/files dns/g' /etc/nsswitch.conf
 
-# metacopy breaks crio on certain OS and isn't necessary for minikube
-# https://github.com/kubernetes/minikube/issues/10520
-RUN sed -ri 's/mountopt = "nodev,metacopy=on"/mountopt = "nodev"/g' /etc/containers/storage.conf
-
 EXPOSE 22
 # create docker user for minikube ssh. to match VM using "docker" as username
 RUN adduser --ingroup docker --disabled-password --gecos '' docker