Implement modifications for engine.#Pull, engine.#Push, docker.#Push, docker.#Pull

Signed-off-by: guillaume <guillaume.derouville@gmail.com>
This commit is contained in:
guillaume
2022-01-31 16:22:19 +01:00
parent 1a98c572b8
commit ac30274d96
6 changed files with 49 additions and 63 deletions

View File

@@ -14,11 +14,10 @@ package engine
config: #ImageConfig
// Authentication
auth: [...{
target: string
auth?: {
username: string
secret: string | #Secret
}]
secret: #Secret
}
// Complete ref of the pushed image, including digest
result: #Ref
@@ -68,11 +67,10 @@ package engine
source: #Ref
// Authentication
auth: [...{
target: string
auth?: {
username: string
secret: string | #Secret
}]
}
// Root filesystem of downloaded image
output: #FS

View File

@@ -12,18 +12,16 @@ import (
source: #Ref
// Registry authentication
// Key must be registry address, for example "index.docker.io"
auth: [registry=string]: {
auth?: {
username: string
secret: dagger.#Secret
}
_op: engine.#Pull & {
"source": source
"auth": [ for target, creds in auth {
"target": target
creds
}]
if auth != _|_ {
"auth": auth
}
}
// Downloaded image

View File

@@ -14,8 +14,7 @@ import (
result: #Ref & _push.result
// Registry authentication
// Key must be registry address
auth: [registry=string]: {
auth?: {
username: string
secret: dagger.#Secret
}
@@ -25,10 +24,9 @@ import (
_push: engine.#Push & {
"dest": dest
"auth": [ for target, creds in auth {
"target": target
creds
}]
if auth != _|_ {
"auth": auth
}
input: image.rootfs
config: image.config
}