From 3d484408d05e69ad28d9db2e12e2784f7eca25be Mon Sep 17 00:00:00 2001 From: Giles Date: Tue, 28 Jul 2020 18:53:57 +0100 Subject: [PATCH] . --- .drone-home.jsonnet | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/.drone-home.jsonnet b/.drone-home.jsonnet index a747518..58cb09e 100644 --- a/.drone-home.jsonnet +++ b/.drone-home.jsonnet @@ -113,17 +113,13 @@ local images = { }, }, ssh: { - image: 'appleboy/drone-ssh', - environment: { - OOO: 'ahahahahaha', - }, + image: 'appleboy/drone-ssh', settings: { host: util.fromSecret("ssh-host"), port: util.fromSecret("ssh-port"), username: util.fromSecret("ssh-user"), password: util.fromSecret("ssh-password"), envs: [ - 'ooo', 'drone_tag', 'drone_commit', 'drone_build_number', @@ -204,18 +200,11 @@ local images = { function(s) function(step) step { settings +: { script +: [ - 'echo "export %(environment)s=\'$${%(environment)s}\'"' % { - environment: util.environment(s), - file: 'thisfile', - secret: util.secret(s), - }, - "export D=${DRONE_COMMIT}", - "export O=$${O}", - "export OOO=$${OOO}", - "echo $${OOO}", + "export %(env)s='$${%(env)s}'" % { env: util.environment(s), }, + "echo '$${%(env)s}'" ], }, }, @@ -225,20 +214,12 @@ local images = { ( images.ssh { name: 'deploy portainer', - environment +: { - O: 'ahahahahaha', - }, settings +: { - envs +: [ - 'o', - ], //username: util.fromSecret("ssh-root-user"), //password: util.fromSecret("ssh-root-password"), script +: [ 'set -e', 'echo go', - 'export OOO=${OOO}', - 'export O=${O}', ] /*+ map(export, secrets) + [