Merge branch 'home-deploy' of https://sigyl.com/git/giles/portainer into home-deploy

This commit is contained in:
Giles Bradshaw 2020-07-28 17:20:40 +01:00
commit 190c393af5
1 changed files with 23 additions and 24 deletions

View File

@ -56,7 +56,7 @@ local util = {
'_', '_',
), ),
), ),
envSet(env): function(step) step { envSet(env): {
environment +: { environment +: {
[util.environment(env)]: util.fromSecret( [util.environment(env)]: util.fromSecret(
util.secret(env) util.secret(env)
@ -68,7 +68,7 @@ local util = {
], ],
}, },
}, },
printEnv(file, env): function(step) util.envSet(env)(step) { printEnv(file, env): function(step) step (util.envSet(env)) {
settings +: { settings +: {
script +: [ script +: [
'echo "export %(environment)s=\'$${%(environment)s}\'" >> %(file)s # "%(secret)s"' % { 'echo "export %(environment)s=\'$${%(environment)s}\'" >> %(file)s # "%(secret)s"' % {
@ -188,9 +188,7 @@ local images = {
publicSecrets, publicSecrets,
) )
)( )(
images.ssh images.ssh {
)
{
name: 'deploy portainer', name: 'deploy portainer',
settings +: { settings +: {
username: util.fromSecret("ssh-root-user"), username: util.fromSecret("ssh-root-user"),
@ -211,6 +209,7 @@ local images = {
] + commands */ ] + commands */
} }
} }
)
], ],
} }
] ]