sigyl
/
jsonnet-drone
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

fix: no longer settings for ssh and scp 

These images get their settings from default environm,ent names
This commit is contained in:
Giles Bradshaw 2020-09-22 12:29:01 +01:00
parent c846f50184
commit 354341178d
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/images.libsonnet
View File

@ -1,10 +1,9 @@
local settings = import 'settings.libsonnet';
{ {
docker(overide): { docker(overide): {
name: 'docker', name: 'docker',
image: 'docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f', image: 'docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f',
} + overide, } + overide,
scp(overide): function(target) settings.ssh { scp(overide): function(target) {
name: 'scp', name: 'scp',
image: 'appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47', image: 'appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47',
settings +: { settings +: {
@ -15,7 +14,7 @@ local settings = import 'settings.libsonnet';
], ],
}, },
} + overide, } + overide,
ssh(overide): settings.ssh { ssh(overide): {
image: 'appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea', image: 'appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea',
settings +: { settings +: {
envs: [ envs: [

12
lib/settings.libsonnet
View File

@ -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}',
},
},
}