Fix defaults for docker
This commit is contained in:
@@ -5,13 +5,15 @@
|
|||||||
["path" :as path]
|
["path" :as path]
|
||||||
[configs :refer [cfg]]))
|
[configs :refer [cfg]]))
|
||||||
|
|
||||||
(defn image [{:keys [app-name]}]
|
(defn image [env]
|
||||||
(let [context-path (.. path (join "." (-> cfg :resource-path)))
|
(let [{:keys [app-name docker:image-opts]} env
|
||||||
|
context-path (.. path (join "." (-> cfg :resource-path)))
|
||||||
dockerfile-path (.. path (join context-path (str app-name ".dockerfile")))
|
dockerfile-path (.. path (join context-path (str app-name ".dockerfile")))
|
||||||
base-args {:context {:location context-path}
|
base-args (if (:is-local docker:image-opts)
|
||||||
:dockerfile {:location dockerfile-path}
|
{:context {:location context-path}
|
||||||
:imageName (str (-> cfg :docker-repo) "/" app-name ":latest")
|
:dockerfile {:location dockerfile-path}
|
||||||
}]
|
:imageName (str (-> cfg :docker-repo) "/" app-name ":latest")}
|
||||||
|
{})]
|
||||||
base-args))
|
base-args))
|
||||||
|
|
||||||
(def defaults
|
(def defaults
|
||||||
|
|||||||
Reference in New Issue
Block a user