Skip to contentSkip to conversation

package/docker-engine: optionally include zfs graphdriver

PATCH In review Audun-Marius Gangstø via buildroot 1 participant 3 messages Jul 15, 2023 – Sep 2, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/docker-engine: optionally include zfs graphdriver

Hello,

Since zfs is in buildroot now, I thought it would be good to enable the graphdriver in docker-engine.

Thank you

---
 package/docker-engine/docker-engine.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/docker-engine/ renamed from package/docker-engine/docker-engine.mk +0 -0

docker-engine.mk
index f904793a..0647a560 100644

package/docker-engine/docker-engine.mk +0 -0
@@ -23,7 +23,7 @@ DOCKER_ENGINE_LDFLAGS = \
        -X $(DOCKER_ENGINE_GOMOD)/dockerversion.InitCommitID="" \
        -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$

(DOCKER_ENGINE_VERSION)"

-DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs +DOCKER_ENGINE_TAGS = cgo
DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy

ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
@@ -56,6 +56,12 @@ else
DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs
endif

+ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_ZFS),y)
+DOCKER_ENGINE_DEPENDENCIES += zfs
+else
+DOCKER_ENGINE_TAGS += exclude_graphdriver_zfs
+endif
+

 # create the go.mod file with language version go1.19
 # remove the conflicting vendor/modules.txt
 # https://github.com/moby/moby/issues/44618#issuecomment-1343565705

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#1 lore raw

Hi again,

I'd really appreciate if you could consider including this patch, or perhaps tell me what I'm doing wrong/missing.

I tried to keep it small and not change default behavior.

It works for me when building on x86_64 and I'm using it in my project at the moment.

Signature · 8 lines
Best regards,
Audun-Marius Gangstø


_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Audun-Marius Gangstø via buildroot

Hello Audun-Marius,

Thanks for your patch! Sorry for the delay in getting back to you. See below some comments.

Quoted 6 lines · On Sat, 15 Jul 2023 18:17:36 +0800 Audun-Marius Gangstø via buildroot…

Hello,

Since zfs is in buildroot now, I thought it would be good to enable the graphdriver in docker-engine.

Thank you

The commit log shouldn't be an e-mail, but just a description of the change. So basically no "Hello", no "Thank you", and no first person sentence. Something like:

Now that ZFS is packaged in Buildroot, this commit adds an option to enable ZFS support in docker-engine.

Quoted 17 lines
package/docker-engine/ renamed from package/docker-engine/docker-engine.mk +0 -0

docker-engine.mk
index f904793a..0647a560 100644

package/docker-engine/docker-engine.mk +0 -0
@@ -23,7 +23,7 @@ DOCKER_ENGINE_LDFLAGS = \
        -X $(DOCKER_ENGINE_GOMOD)/dockerversion.InitCommitID="" \
        -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$

(DOCKER_ENGINE_VERSION)"

package/docker-engine/docker-engine.mk +1 -1
-DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs
+DOCKER_ENGINE_TAGS = cgo
 DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy
 
 ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)

package/docker-engine/docker-engine.mk else · line 59

Quoted 4 lines
package/docker-engine/docker-engine.mk +1 -0
@@ -56,6 +56,12 @@ else
 DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs
 endif
 
+ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_ZFS),y)

Where is this option added? I think you forgot to "git add" your changes in the Config.in file.

Could you fix those issues and sent an updated version of your patch?

Thanks a lot!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot