diff --git a/lib/images.libsonnet b/lib/images.libsonnet index 960ddef..e9f561a 100644 --- a/lib/images.libsonnet +++ b/lib/images.libsonnet @@ -1,10 +1,9 @@ -local settings = import 'settings.libsonnet'; { docker(overide): { name: 'docker', image: 'docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f', } + overide, - scp(overide): function(target) settings.ssh { + scp(overide): function(target) { name: 'scp', image: 'appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47', settings +: { @@ -15,7 +14,7 @@ local settings = import 'settings.libsonnet'; ], }, } + overide, - ssh(overide): settings.ssh { + ssh(overide): { image: 'appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea', settings +: { envs: [ diff --git a/lib/settings.libsonnet b/lib/settings.libsonnet deleted file mode 100644 index 7fe488b..0000000 --- a/lib/settings.libsonnet +++ /dev/null @@ -1,12 +0,0 @@ -local environment = import 'node_modules/@sigyl/jsonnet-drone-environment/environment.libsonnet'; -{ - ssh: { - settings +: { - host: '${SSH_HOST}', - username: '${SSH_USER}', - key: '${SSH_KEY}', - port: '${SSH_PORT}', - passphrase: '${SSH_PASSPHRASE}', - }, - }, -} \ No newline at end of file