Switch to passing in quota in GB, because passing in MB is just a very large number

Author: TimJDFletcher

samba-timemachine/README.md

@@ -50,14 +50,17 @@ A custom username can be passed to the container with the environment variable `
 
 A custom password can be passed to the container with the environment variable `PASS`.
 
-# Quotas
+# Quota
 
-The container supports setting of quota to limit the max size of backups, it defaults to 512GB.
+*BREAKING CHANGE in v2.7* Changing quota to be configured in Gigabytes
+
+The container supports setting of quota to limit the max size of backups, it defaults to 1024GB (1TB).
 I'm unclear if this works correctly in modern versions of macOS.
 
 The SAMBA setting of `disk max size` is also configured to limit the reported size of the disk to the same as the configured quota. 
 This is a soft limit not a hard limit.
 
+
 # Building the Docker image
 
 To build the image you need to have docker and docker buildx available, this is included by default in docker desktop 

samba-timemachine/entrypoint

@@ -6,12 +6,13 @@ export PASS="${PASS:-password}"
 export PUID="${PUID:-999}"
 export PGID="${PGID:-999}"
 export LOG_LEVEL="${LOG_LEVEL:-2}"
-export QUOTA="${QUOTA:-512000}"
+export QUOTA="${QUOTA:-1024}"
 
 calculateQuota()
 {
-    echo "Quota is ${QUOTA}MB"
-    export QUOTA_IN_MEGABYTES="${QUOTA}"
+    echo "Quota is ${QUOTA} GB"
+    export QUOTA_IN_GIGABYTES="${QUOTA}"
+    export QUOTA_IN_MEGABYTES="$((QUOTA_IN_GIGABYTES * 1024))"
     export QUOTA_IN_BYTES=$((QUOTA_IN_MEGABYTES * 1024 * 1024))
 }
 

samba-timemachine/spec/samba-timemachine/samba-timemachine_spec.rb

@@ -12,7 +12,7 @@ def compose
     ENV['PGID'] = '1234'
     ENV['USER'] = 'testuser'
     ENV['PASS'] = 'Password123'
-    ENV['QUOTA'] = '123456'
+    ENV['QUOTA'] = '1234'
     ENV['LOG_LEVEL'] = '4'
     compose.up('samba-timemachine', detached: true)
   end
@@ -35,8 +35,8 @@ def compose
     it { should be_file }
     it { should be_mode 644 }
     it { should be_owned_by 'root' }
-    its(:content) { is_expected.to match('max disk size               = 123456') }
-    its(:content) { is_expected.to match('fruit:time machine max size = 123456 MB') }
+    its(:content) { is_expected.to match('max disk size               = 1263616') }
+    its(:content) { is_expected.to match('fruit:time machine max size = 1263616 MB') }
     its(:content) { is_expected.to match('log level               = 4') }
   end
 
@@ -60,7 +60,7 @@ def compose
     it { should be_mode 444 }
     it { should be_owned_by 'root' }
     it { should be_grouped_into 'root' }
-    its(:content) { is_expected.to match('129452998656') }
+    its(:content) { is_expected.to match('1324997410816') }
   end
 
   describe group('timemachine') do