From 39ec48492f8b6dc9afc18ed0d1a26c5eb1ba7bbd Mon Sep 17 00:00:00 2001 From: Antoine Date: Tue, 4 Aug 2020 01:04:32 +0200 Subject: [PATCH] fix wget conditionnal for base images --- Dockerfile | 1 + docker-compose.yml | 8 ++++++-- libvirtd.sh | 12 ++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f067040..19e2f98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ RUN yum install -y \ libvirt-daemon-qemu \ libvirt-client \ selinux-policy selinux-policy-targeted \ + wget \ augeas COPY augconf /augconf diff --git a/docker-compose.yml b/docker-compose.yml index 60018dc..fcb4fc2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,10 +13,14 @@ services: - "8080:8080" environment: LIBVIRTD_DEFAULT_NETWORK: "true" - LIBVIRTD_DEFAULT_POOL_PATH: "/var/lib/libvirt/images" + LIBVIRTD_DEFAULT_POOL_PATH: "/var/lib/libvirt/pool/default" + PRE_DOWNLOAD_IMAGES: + "https://cdimage.debian.org/cdimage/openstack/current-10/debian-10-openstack-amd64.qcow2,\ + https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2" volumes: - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket - - libvirt-images:/var/lib/libvirt/images + - libvirt-images:/images + - libvirt-pool:/var/lib/libvirt/pool - /:/host:Z volumes: libvirt-images: diff --git a/libvirtd.sh b/libvirtd.sh index 836cf35..78b256f 100644 --- a/libvirtd.sh +++ b/libvirtd.sh @@ -87,6 +87,18 @@ EOX ln -s /etc/libvirt/storage/default.xml /etc/libvirt/storage/autostart/default.xml fi +# Download some image at startup +if [[ -n "$PRE_DOWNLOAD_IMAGES" ]]; then + # loop on each image and download it + echo "$PRE_DOWNLOAD_IMAGES" | sed -n 1'p' | tr ',' '\n' | while read image; do + + if [ ! -f /images/"$(basename $image)" ]; then + echo "downloading $image ..." + wget "$image" -O /images/"$(basename $image)" & + fi + done +fi + echo "cgroup_controllers = []" >> /etc/libvirt/qemu.conf echo "namespaces = []" >> /etc/libvirt/qemu.conf