meissa/dda-build
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

implement-c4k-and-provs #1

Merged
bom merged 17 commits from implement-c4k-and-provs into main 2024-10-18 09:22:48 +00:00
Conversation 0 Commits 17 Files changed 13 +7 -7
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 91ad092b1f - Show all commits

12
src/dda/build/c4k/domain.clj
View file

@ -34,15 +34,15 @@
(defn-spec c4k-uberjar-command seq? (defn-spec c4k-uberjar-command seq?
[config ::config] [config ::config]
(let [{:keys [name]} config (let [{:keys [module]} config
executable-name (str "c4k-" name "-standalone.jar")] executable-name (str "c4k-" module "-standalone.jar")]
["bash" "-c" (str executable-name " " (config-path config) " " (auth-path config) " > " (output-path config))])) [["bash" "-c" (str executable-name " " (config-path config) " " (auth-path config) " > " (output-path config))]]))
(defn-spec c4k-graalvm-command seq? (defn-spec c4k-graalvm-command seq?
[config ::config] [config ::config]
(let [{:keys [name]} config (let [{:keys [module]} config
executable-name (str "c4k-" name)] executable-name (str "c4k-" module)]
["bash" "-c" (str executable-name " " (config-path config) " " (auth-path config) " > " (output-path config))])) [["bash" "-c" (str executable-name " " (config-path config) " " (auth-path config) " > " (output-path config))]]))
(defn-spec create-c4k-config map? (defn-spec create-c4k-config map?
[config ::config [config ::config

2
src/dda/build/provs/domain.clj
View file

@ -38,7 +38,7 @@
tf-out ::td/tf-out] tf-out ::td/tf-out]
(let [{:keys [k3s-output-filename k3s-provision-user]} config (let [{:keys [k3s-output-filename k3s-provision-user]} config
fqdn (get-in tf-out [:out :value :fqdn])] fqdn (get-in tf-out [:out :value :fqdn])]
["provs-server.jar" "k3s" (str k3s-provision-user "@" fqdn) "-c" (output-path config) "-a" (c4k-d/output-path config)])) [["provs-server.jar" "k3s" (str k3s-provision-user "@" fqdn) "-c" (output-path config) "-a" (c4k-d/output-path config)]]))
(defn-spec create-k3s-config map? (defn-spec create-k3s-config map?
[config ::config [config ::config