fix 5

constantineav · Mar 12, 2024 · e41e102 · e41e102
1 parent 0dd2eed
commit e41e102
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/clj/swarmpit/docker/engine/mapper/compose.clj b/src/clj/swarmpit/docker/engine/mapper/compose.clj
@@ -72,8 +72,8 @@
                              {:interval (str (:interval healthcheck) "s")}
                              {:timeout (str (:timeout healthcheck) "s")})))
      :tty (-> service :tty)
-     :cap_add (-> service :cap_add (name-value->sorted-map))
-     :cap_drop (-> service :cap_drop (name-value->sorted-map))
+     :cap_add (->> service :cap_add)
+     :cap_drop (->> service :cap_drop)
      :environment (-> service :variables (name-value->sorted-map))
      :ports (->> service :ports
                  (map #(str (:hostPort %) ":" (:containerPort %) (when (= "udp" (:protocol %)) "/udp"))))

diff --git a/src/cljc/swarmpit/routes_spec.cljc b/src/cljc/swarmpit/routes_spec.cljc
@@ -181,8 +181,8 @@
    :user            string?
    :dir             string?
    :tty             boolean?
-   :cap_add         string?
-   :cap_drop        string?
+   :cap_add         [string?]
+   :cap_drop        [string?]
    :healthcheck     {:test     [string?]
                      :interval number?
                      :timeout  number?
@@ -282,8 +282,8 @@
    (ds/opt :user)            string?
    (ds/opt :dir)             string?
    (ds/opt :tty)             boolean
-   (ds/opt :cap_add)         string?
-   (ds/opt :cap_drop)        string?
+   (ds/opt :cap_add)         [string?]
+   (ds/opt :cap_drop)        [string?]
    (ds/opt :healthcheck)     {:test     [string?]
                               :interval number?
                               :timeout  number?