From 4183cdca1497c56806333a56470715dbf733057c Mon Sep 17 00:00:00 2001 From: David Personette Date: Sat, 16 Nov 2019 06:36:47 -0500 Subject: [PATCH] Dockerfile* merge suggested changes for timemachine from samba wiki --- Dockerfile | 25 ++++++++++++------------- Dockerfile.aarch64 | 25 ++++++++++++------------- Dockerfile.armhf | 25 ++++++++++++------------- 3 files changed, 36 insertions(+), 39 deletions(-) diff --git a/Dockerfile b/Dockerfile index b884dcf..d476311 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,8 @@ RUN apk --no-cache --no-progress upgrade && \ echo ' disable spoolss = yes' >>$file && \ echo ' socket options = TCP_NODELAY' >>$file && \ echo ' strict locking = no' >>$file && \ + echo ' aio read size = 0' >>$file && \ + echo ' aio write size = 0' >>$file && \ echo ' vfs objects = acl_xattr catia fruit recycle streams_xattr' \ >>$file && \ echo ' recycle:keeptree = yes' >>$file && \ @@ -41,23 +43,20 @@ RUN apk --no-cache --no-progress upgrade && \ echo '' >>$file && \ echo ' # Security' >>$file && \ echo ' client ipc max protocol = default' >>$file && \ + echo ' client ipc min protocol = SMB2_10' >>$file && \ echo ' client max protocol = default' >>$file && \ - echo ' server max protocol = SMB3' >>$file && \ - echo ' client ipc min protocol = default' >>$file && \ - echo ' client min protocol = CORE' >>$file && \ - echo ' server min protocol = SMB2' >>$file && \ + echo ' server max protocol = default' >>$file && \ + echo ' client min protocol = SMB2_10' >>$file && \ + echo ' server min protocol = SMB2_10' >>$file && \ echo '' >>$file && \ echo ' # Time Machine' >>$file && \ - echo ' durable handles = yes' >>$file && \ - echo ' kernel oplocks = no' >>$file && \ - echo ' kernel share modes = no' >>$file && \ - echo ' posix locking = no' >>$file && \ - echo ' fruit:aapl = yes' >>$file && \ - echo ' fruit:advertise_fullsync = true' >>$file && \ + echo ' fruit:metadata = stream' >>$file && \ + echo ' fruit:model = MacSamba' >>$file && \ + echo ' fruit:posix_rename = yes' >>$file && \ + echo ' fruit:veto_appledouble = no' >>$file && \ + echo ' fruit:wipe_intentionally_left_blank_rfork = yes' >>$file && \ + echo ' fruit:delete_empty_adfiles = yes' >>$file && \ echo ' fruit:time machine = yes' >>$file && \ - echo ' smb2 leases = yes' >>$file && \ - echo ' aio read size = 0' >>$file && \ - echo ' aio write size = 0' >>$file && \ echo '' >>$file && \ rm -rf /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 55ee977..b8ad4ff 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -33,6 +33,8 @@ RUN apk --no-cache --no-progress upgrade && \ echo ' disable spoolss = yes' >>$file && \ echo ' socket options = TCP_NODELAY' >>$file && \ echo ' strict locking = no' >>$file && \ + echo ' aio read size = 0' >>$file && \ + echo ' aio write size = 0' >>$file && \ echo ' vfs objects = acl_xattr catia fruit recycle streams_xattr' \ >>$file && \ echo ' recycle:keeptree = yes' >>$file && \ @@ -42,23 +44,20 @@ RUN apk --no-cache --no-progress upgrade && \ echo '' >>$file && \ echo ' # Security' >>$file && \ echo ' client ipc max protocol = default' >>$file && \ + echo ' client ipc min protocol = SMB2_10' >>$file && \ echo ' client max protocol = default' >>$file && \ - echo ' server max protocol = SMB3' >>$file && \ - echo ' client ipc min protocol = default' >>$file && \ - echo ' client min protocol = CORE' >>$file && \ - echo ' server min protocol = SMB2' >>$file && \ + echo ' server max protocol = default' >>$file && \ + echo ' client min protocol = SMB2_10' >>$file && \ + echo ' server min protocol = SMB2_10' >>$file && \ echo '' >>$file && \ echo ' # Time Machine' >>$file && \ - echo ' durable handles = yes' >>$file && \ - echo ' kernel oplocks = no' >>$file && \ - echo ' kernel share modes = no' >>$file && \ - echo ' posix locking = no' >>$file && \ - echo ' fruit:aapl = yes' >>$file && \ - echo ' fruit:advertise_fullsync = true' >>$file && \ + echo ' fruit:metadata = stream' >>$file && \ + echo ' fruit:model = MacSamba' >>$file && \ + echo ' fruit:posix_rename = yes' >>$file && \ + echo ' fruit:veto_appledouble = no' >>$file && \ + echo ' fruit:wipe_intentionally_left_blank_rfork = yes' >>$file && \ + echo ' fruit:delete_empty_adfiles = yes' >>$file && \ echo ' fruit:time machine = yes' >>$file && \ - echo ' smb2 leases = yes' >>$file && \ - echo ' aio read size = 0' >>$file && \ - echo ' aio write size = 0' >>$file && \ echo '' >>$file && \ rm -rf /tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 153e4a1..3fd34b8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -33,6 +33,8 @@ RUN apk --no-cache --no-progress upgrade && \ echo ' disable spoolss = yes' >>$file && \ echo ' socket options = TCP_NODELAY' >>$file && \ echo ' strict locking = no' >>$file && \ + echo ' aio read size = 0' >>$file && \ + echo ' aio write size = 0' >>$file && \ echo ' vfs objects = acl_xattr catia fruit recycle streams_xattr' \ >>$file && \ echo ' recycle:keeptree = yes' >>$file && \ @@ -42,23 +44,20 @@ RUN apk --no-cache --no-progress upgrade && \ echo '' >>$file && \ echo ' # Security' >>$file && \ echo ' client ipc max protocol = default' >>$file && \ + echo ' client ipc min protocol = SMB2_10' >>$file && \ echo ' client max protocol = default' >>$file && \ - echo ' server max protocol = SMB3' >>$file && \ - echo ' client ipc min protocol = default' >>$file && \ - echo ' client min protocol = CORE' >>$file && \ - echo ' server min protocol = SMB2' >>$file && \ + echo ' server max protocol = default' >>$file && \ + echo ' client min protocol = SMB2_10' >>$file && \ + echo ' server min protocol = SMB2_10' >>$file && \ echo '' >>$file && \ echo ' # Time Machine' >>$file && \ - echo ' durable handles = yes' >>$file && \ - echo ' kernel oplocks = no' >>$file && \ - echo ' kernel share modes = no' >>$file && \ - echo ' posix locking = no' >>$file && \ - echo ' fruit:aapl = yes' >>$file && \ - echo ' fruit:advertise_fullsync = true' >>$file && \ + echo ' fruit:metadata = stream' >>$file && \ + echo ' fruit:model = MacSamba' >>$file && \ + echo ' fruit:posix_rename = yes' >>$file && \ + echo ' fruit:veto_appledouble = no' >>$file && \ + echo ' fruit:wipe_intentionally_left_blank_rfork = yes' >>$file && \ + echo ' fruit:delete_empty_adfiles = yes' >>$file && \ echo ' fruit:time machine = yes' >>$file && \ - echo ' smb2 leases = yes' >>$file && \ - echo ' aio read size = 0' >>$file && \ - echo ' aio write size = 0' >>$file && \ echo '' >>$file && \ rm -rf /tmp/*