From 5960559f0eae8b0310149d33410eee752eea7ccf Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 23 Aug 2021 12:34:17 -0700 Subject: [PATCH] Enable FUSE support (6.0+) https://www.qemu.org/2021/08/22/fuse-blkexport/ --- 6.0/Dockerfile | 4 ++++ 6.0/Dockerfile.native | 4 ++++ Dockerfile.template | 10 +++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/6.0/Dockerfile b/6.0/Dockerfile index 340106f..ef92abe 100644 --- a/6.0/Dockerfile +++ b/6.0/Dockerfile @@ -85,6 +85,8 @@ RUN set -eux; \ # https://wiki.qemu.org/ChangeLog/5.2#Build_Information ninja-build \ python3-setuptools \ +# https://www.qemu.org/2021/08/22/fuse-blkexport/ + libfuse3-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ @@ -158,6 +160,8 @@ RUN set -eux; \ --enable-xfsctl \ # 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-vde \ +# https://www.qemu.org/2021/08/22/fuse-blkexport/ + --enable-fuse \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/6.0/Dockerfile.native b/6.0/Dockerfile.native index 8bc26e0..06086dc 100644 --- a/6.0/Dockerfile.native +++ b/6.0/Dockerfile.native @@ -87,6 +87,8 @@ RUN set -eux; \ # https://wiki.qemu.org/ChangeLog/5.2#Build_Information ninja-build \ python3-setuptools \ +# https://www.qemu.org/2021/08/22/fuse-blkexport/ + libfuse3-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ @@ -166,6 +168,8 @@ RUN set -eux; \ --enable-xfsctl \ # 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-vde \ +# https://www.qemu.org/2021/08/22/fuse-blkexport/ + --enable-fuse \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/Dockerfile.template b/Dockerfile.template index ddf1c08..d18570a 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -109,10 +109,14 @@ RUN set -eux; \ python3 \ xfslibs-dev \ zlib1g-dev \ -{{ if ["4.2", "5.0", "5.1"] | index(env.version) then "" else ( -}} +{{ if ["5.0", "5.1"] | index(env.version) then "" else ( -}} # https://wiki.qemu.org/ChangeLog/5.2#Build_Information ninja-build \ python3-setuptools \ +{{ ) end -}} +{{ if ["5.0", "5.1", "5.2"] | index(env.version) then "" else ( -}} +# https://www.qemu.org/2021/08/22/fuse-blkexport/ + libfuse3-dev \ {{ ) end -}} ; \ rm -rf /var/lib/apt/lists/*; \ @@ -205,6 +209,10 @@ RUN set -eux; \ --enable-xfsctl \ # 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-vde \ +{{ if ["5.0", "5.1", "5.2"] | index(env.version) then "" else ( -}} +# https://www.qemu.org/2021/08/22/fuse-blkexport/ + --enable-fuse \ +{{ ) end -}} ; \ make -j "$(nproc)"; \ make install; \