check unicity of tmpfs when merging

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
compose-spec · Jan 29, 2024 · f17ec54 · f17ec54
1 parent a9bdf55
commit f17ec54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/override/merge_tmpfs_test.go b/override/merge_tmpfs_test.go
@@ -33,6 +33,7 @@ services:
     tmpfs:
       - /bar
       - /baz
+      - /foo
 `, `
 services:
   test:
@@ -70,6 +71,7 @@ services:
   test:
     tmpfs:
       - /bar
+      - /foo
 `
 
 	r := `

diff --git a/override/uncity.go b/override/uncity.go
@@ -57,6 +57,7 @@ func init() {
 	unique["services.*.profiles"] = keyValueIndexer
 	unique["services.*.secrets"] = mountIndexer("/run/secrets")
 	unique["services.*.sysctls"] = keyValueIndexer
+	unique["services.*.tmpfs"] = keyValueIndexer
 	unique["services.*.volumes"] = volumeIndexer
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ services: @@
         tmpfs:
           - /bar
           - /baz
+          - /foo
     `, `
     services:
       test:
@@ Expand Down Expand Up / @@ -70,6 +71,7 @@ services: @@
       test:
         tmpfs:
           - /bar
+          - /foo
     `
     	r := `
@@ Expand Down @@