diff --git a/service.nomad b/service.nomad index ab52599..f2bd6a4 100644 --- a/service.nomad +++ b/service.nomad @@ -15,6 +15,7 @@ # change_signal = str, # left_delimiter = str, # right_delimiter = str, +# mount = bool # ))) # host_volumes = json(list(dict( # name = str, @@ -29,6 +30,15 @@ # mysql = bool # redis = bool # vault = bool +# mysql_bootstrap = json(dict( +# vault_key = str +# db_name = str +# db_name_key = str +# db_user = str +# db_user_key = str +# db_pass = str +# db_pass_key = str +# )) job "[[.name]]" { region = "global" datacenters = ["dc1"] @@ -139,20 +149,22 @@ job "[[.name]]" { config { image = "[[.image]]" - [[ if not (empty .service_port) -]] + [[ with .service_port -]] ports = ["main"] [[ end -]] - [[ if not (empty .args) -]] - args = ["[[ .args | parseJSON | join `", "` ]]"] + [[ with .args -]] + args = [[ . ]] [[ end -]] [[ with .templates -]] [[ range $t := . | parseJSON -]] + [[ if and (default true $t.mount) (not (default false $t.env)) -]] mount { type = "bind" target = "[[ $t.dest ]]" - source = "local/[[ $t.dest ]]" + source = "[[ default "local/" $t.dest_prefix ]][[ $t.dest ]]" } + [[ end -]] [[ end ]] [[ end -]] } @@ -190,7 +202,7 @@ job "[[.name]]" { data = <