Merge pull request #3352 from vyaghras/fix_commas_in_daemon_json

docker: fix config file
bottlerocket-os · Aug 25, 2023 · 2f7124a · 2f7124a
2 parents dea2c11 + 9695b05
commit 2f7124a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 26 deletions.
diff --git a/packages/docker-engine/daemon-json b/packages/docker-engine/daemon-json
@@ -6,20 +6,20 @@
   "data-root": "/var/lib/docker",
   "default-runtime": "shimpei",
   "runtimes": { "shimpei": { "path": "shimpei" } },
-  "selinux-enabled": true,
-  {{~#if settings.oci-defaults.capabilities~}}
-  "default-capabilities": {{~oci_defaults "docker" settings.oci-defaults.capabilities~}}
-  {{~/if~}}
-  {{~#if settings.oci-defaults.resource-limits~}}
+  {{#if settings.oci-defaults.capabilities}}
+  "default-capabilities": {{oci_defaults "docker" settings.oci-defaults.capabilities}},
+  {{/if}}
+  {{#if settings.oci-defaults.resource-limits}}
   "default-ulimits": {
-    {{~oci_defaults "docker" settings.oci-defaults.resource-limits~}}
-  }
-  {{~/if~}}
+    {{oci_defaults "docker" settings.oci-defaults.resource-limits}}
+  },
+  {{/if}}
   {{#if settings.container-registry.mirrors}}
   {{#each settings.container-registry.mirrors}}
-  {{#if (eq registry "docker.io" )}},
-  "registry-mirrors": [{{join_array ", " endpoint}}]
+  {{#if (eq registry "docker.io" )}}
+  "registry-mirrors": [{{join_array ", " endpoint}}],
   {{/if}}
   {{/each}}
   {{/if}}
+  "selinux-enabled": true
 }
diff --git a/packages/docker-engine/daemon-nvidia-json b/packages/docker-engine/daemon-nvidia-json
@@ -6,20 +6,20 @@
   "data-root": "/var/lib/docker",
   "default-runtime": "shimpei",
   "runtimes": { "shimpei": { "path": "shimpei" }, "nvidia": { "path": "nvidia-oci" } },
-  "selinux-enabled": true,
-  {{~#if settings.oci-defaults.capabilities~}}
-  "default-capabilities": {{~oci_defaults "docker" settings.oci-defaults.capabilities~}}
-  {{~/if~}}
-  {{~#if settings.oci-defaults.resource-limits~}}
+  {{#if settings.oci-defaults.capabilities}}
+  "default-capabilities": {{oci_defaults "docker" settings.oci-defaults.capabilities}},
+  {{/if}}
+  {{#if settings.oci-defaults.resource-limits}}
   "default-ulimits": {
-  {{~oci_defaults "docker" settings.oci-defaults.resource-limits~}}
-  }
-  {{~/if~}}
+  {{oci_defaults "docker" settings.oci-defaults.resource-limits}}
+  },
+  {{/if}}
   {{#if settings.container-registry.mirrors}}
   {{#each settings.container-registry.mirrors}}
-  {{#if (eq registry "docker.io" )}},
-  "registry-mirrors": [{{join_array ", " endpoint}}]
+  {{#if (eq registry "docker.io" )}}
+  "registry-mirrors": [{{join_array ", " endpoint}}],
   {{/if}}
   {{/each}}
   {{/if}}
+  "selinux-enabled": true
 }
diff --git a/sources/api/schnauzer/src/helpers.rs b/sources/api/schnauzer/src/helpers.rs
@@ -1412,10 +1412,7 @@ struct Containerd;
 impl Docker {
     /// Formats capabilities for Docker
     fn get_capabilities(caps: String) -> String {
-        format!(
-            concat!(r#"["#, "{capabilities}", "],\n",),
-            capabilities = caps,
-        )
+        format!(concat!(r#"["#, "{capabilities}", "]",), capabilities = caps)
     }
 
     /// Formats resource limits for Docker
@@ -2918,8 +2915,7 @@ mod test_oci_spec {
             rendered,
             r#"["CAP_KILL",
 "CAP_MAC_ADMIN",
-"CAP_MKNOD"],
-"#
+"CAP_MKNOD"]"#
         );
     }