From 3d483b292c130305c6ab4aaf1629915f5a685bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 23 Mar 2019 22:15:49 +0100 Subject: [PATCH] Use podman instead of rkt, for extracting toolbox Need to create and mount a dummy container, to get at image. Used rsync instead of cp -pR, easier with sudo permissions. --- .../coreos/minikube/rootfs-overlay/usr/bin/toolbox | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox index 3f38c70ec1..bdfad1d3e9 100644 --- a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox +++ b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox @@ -50,9 +50,13 @@ if [ ! -f "${osrelease}" ] || systemctl is-failed -q "${machinename}" ; then sudo chown "${USER}:" "${machinepath}" if [[ -n "${have_docker_image}" ]]; then - riid=$(sudo --preserve-env rkt --insecure-options=image fetch "docker://${TOOLBOX_DOCKER_IMAGE}:${TOOLBOX_DOCKER_TAG}") - sudo --preserve-env rkt image extract --overwrite --rootfs-only "${riid}" "${machinepath}" - sudo --preserve-env rkt image rm "${riid}" + piid=$(sudo --preserve-env podman pull "docker://${TOOLBOX_DOCKER_IMAGE}:${TOOLBOX_DOCKER_TAG}") + pcid=$(sudo --preserve-env podman create "${piid}") + mnt=$(sudo --preserve-env podman mount "${pcid}") + sudo --preserve-env rsync -ax "${mnt}"/ "${machinepath}"/ + sudo --preserve-env podman unmount "${pcid}" + sudo --preserve-env podman rm "${pcid}" + sudo --preserve-env podman rmi "${piid}" else echo "Error: No toolbox filesystem specified." >&2 exit 1