kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Fix mounts in cli.#Run

Browse Source 
Moving the `if`s inside the fields avoids some issues.

Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
This commit is contained in:
Helder Correia 2022-04-04 14:04:46 +00:00
parent 7dbe4e9aa5
commit b9c428cf7e
No known key found for this signature in database
GPG Key ID: C6490D872EF1DCA7
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/universe.dagger.io/docker/cli/client.cue
View File

@ -51,42 +51,47 @@ import (
docker.#Run & { docker.#Run & {
env: DOCKER_HOST: host env: DOCKER_HOST: host
mounts: {
if ssh.key != _|_ { if ssh.key != _|_ {
mounts: ssh_key: { ssh_key: {
dest: "/root/.ssh/id_rsa" dest: "/root/.ssh/id_rsa"
contents: ssh.key contents: ssh.key
} }
} }
if ssh.knownHosts != _|_ { if ssh.knownHosts != _|_ {
mounts: ssh_hosts: { ssh_hosts: {
dest: "/root/.ssh/known_hosts" dest: "/root/.ssh/known_hosts"
contents: ssh.knownHosts contents: ssh.knownHosts
} }
} }
} }
}
} }
// Connect via HTTP/HTTPS // Connect via HTTP/HTTPS
#RunTCP: { #RunTCP: {
host: =~"^tcp://.+" host: =~"^tcp://.+"
docker.#Run & {
env: DOCKER_HOST: host
// Directory with certificates to verify ({ca,cert,key}.pem files). // Directory with certificates to verify ({ca,cert,key}.pem files).
// This enables HTTPS. // This enables HTTPS.
certs?: dagger.#FS certs?: dagger.#FS
if certs != _|_ { docker.#Run & {
env: { env: {
DOCKER_HOST: host
if certs != _|_ {
DOCKER_TLS_VERIFY: "1" DOCKER_TLS_VERIFY: "1"
DOCKER_CERT_PATH: "/certs/client" DOCKER_CERT_PATH: "/certs/client"
} }
mounts: "certs": { }
mounts: {
if certs != _|_ {
"certs": {
dest: "/certs/client" dest: "/certs/client"
contents: certs contents: certs
} }
} }
} }
}
} }