QA-352 image maintenance

src/oracle/install/tools/install_tools_deluxe.sh

@@ -2,7 +2,12 @@
 set -ex
 
 if [ -f /usr/bin/dnf ]; then
-  dnf install -y vlc git tmux xz glibc-locale-source glibc-langpack-en
+  # Pin glibc-locale-source/glibc-langpack-en to the glibc already in the base
+  # image. The base ships a version of glibc; leaving them
+  # unpinned makes dnf try to install versions which conflicts
+  # with the installed glibc-common and the langpacks.
+  glibc_ver="$(rpm -q --qf '%{version}-%{release}' glibc)"
+  dnf install -y vlc git tmux xz "glibc-locale-source-${glibc_ver}" "glibc-langpack-en-${glibc_ver}"
   if [ -z ${SKIP_CLEAN+x} ]; then
     dnf clean all
   fi

src/ubuntu/install/dind_rootless/install_dind_rootless.sh

@@ -20,29 +20,16 @@ apt-get install -y \
     fuse-overlayfs \
     iptables \
     kmod \
+    slirp4netns \
     openssh-client \
     sudo \
     supervisor \
     uidmap \
     wget
 
-# URLs
-STABLE_LATEST=$(curl -sL https://get.docker.com/rootless | awk -F'="' '/STABLE_LATEST=/ {print substr($2, 1, length($2)-1)}')
-STATIC_RELEASE_ROOTLESS_URL="https://download.docker.com/linux/static/stable/$(uname -m)/docker-rootless-extras-${STABLE_LATEST}.tgz"
-
 # User settings
 echo 'hosts: files dns' > /etc/nsswitch.conf
 
-# Install rootless extras
-curl -o \
-  /tmp/rootless.tgz -L \
-  "${STATIC_RELEASE_ROOTLESS_URL}"
-tar -xf \
-  /tmp/rootless.tgz \
-  --strip-components 1 \
-  --directory /usr/local/bin/ \
-  'docker-rootless-extras/vpnkit'
-
 # Cleanup
 if [ -z ${SKIP_CLEAN+x} ]; then
   apt-get autoclean