From dc1de6a9144ab4c6cc9b4ad3a3b7cbf03076432c Mon Sep 17 00:00:00 2001 From: Alex Thomae Date: Thu, 27 Aug 2020 22:04:22 +0200 Subject: [PATCH] Enable support for RBD Signed-off-by: Alex Thomae --- 4.1/Dockerfile | 4 +++- 4.2/Dockerfile | 4 +++- 5.0/Dockerfile | 4 +++- 5.1/Dockerfile | 4 +++- Dockerfile.template | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/4.1/Dockerfile b/4.1/Dockerfile index 0a89236..259a3f6 100644 --- a/4.1/Dockerfile +++ b/4.1/Dockerfile @@ -53,6 +53,7 @@ RUN set -eux; \ libnuma-dev \ libpixman-1-dev \ libpng-dev \ + librbd-dev \ libseccomp-dev \ libssh-dev \ libusb-1.0-0-dev \ @@ -136,7 +137,8 @@ RUN set -eux; \ --enable-vnc-png \ --enable-xen \ --enable-xfsctl \ -# --enable-rbd \ +# rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) + --enable-rbd \ # --enable-vde \ ; \ make -j "$(nproc)"; \ diff --git a/4.2/Dockerfile b/4.2/Dockerfile index 98ae973..2c2edd1 100644 --- a/4.2/Dockerfile +++ b/4.2/Dockerfile @@ -53,6 +53,7 @@ RUN set -eux; \ libnuma-dev \ libpixman-1-dev \ libpng-dev \ + librbd-dev \ libseccomp-dev \ libssh-dev \ libusb-1.0-0-dev \ @@ -136,7 +137,8 @@ RUN set -eux; \ --enable-vnc-png \ --enable-xen \ --enable-xfsctl \ -# --enable-rbd \ +# rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) + --enable-rbd \ # --enable-vde \ ; \ make -j "$(nproc)"; \ diff --git a/5.0/Dockerfile b/5.0/Dockerfile index e5f9070..db3e657 100644 --- a/5.0/Dockerfile +++ b/5.0/Dockerfile @@ -53,6 +53,7 @@ RUN set -eux; \ libnuma-dev \ libpixman-1-dev \ libpng-dev \ + librbd-dev \ libseccomp-dev \ libssh-dev \ libusb-1.0-0-dev \ @@ -136,7 +137,8 @@ RUN set -eux; \ --enable-vnc-png \ --enable-xen \ --enable-xfsctl \ -# --enable-rbd \ +# rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) + --enable-rbd \ # --enable-vde \ ; \ make -j "$(nproc)"; \ diff --git a/5.1/Dockerfile b/5.1/Dockerfile index 89d0b94..01af579 100644 --- a/5.1/Dockerfile +++ b/5.1/Dockerfile @@ -53,6 +53,7 @@ RUN set -eux; \ libnuma-dev \ libpixman-1-dev \ libpng-dev \ + librbd-dev \ libseccomp-dev \ libssh-dev \ libusb-1.0-0-dev \ @@ -136,7 +137,8 @@ RUN set -eux; \ --enable-vnc-png \ --enable-xen \ --enable-xfsctl \ -# --enable-rbd \ +# rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) + --enable-rbd \ # --enable-vde \ ; \ make -j "$(nproc)"; \ diff --git a/Dockerfile.template b/Dockerfile.template index 6db5d42..60e2ac7 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -47,6 +47,7 @@ RUN set -eux; \ libnuma-dev \ libpixman-1-dev \ libpng-dev \ + librbd-dev \ libseccomp-dev \ libssh-dev \ libusb-1.0-0-dev \ @@ -130,7 +131,8 @@ RUN set -eux; \ --enable-vnc-png \ --enable-xen \ --enable-xfsctl \ -# --enable-rbd \ +# rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) + --enable-rbd \ # --enable-vde \ ; \ make -j "$(nproc)"; \