mirror of
https://github.com/drone/drone-kaniko.git
synced 2026-06-26 16:03:13 +08:00
Compare commits
6 Commits
v2_registry
...
fix_label
| Author | SHA1 | Date | |
|---|---|---|---|
| 33f15bdebe | |||
| 10df8f28b9 | |||
| 17072a25f1 | |||
| 26c93eccd1 | |||
| ee562a4a1b | |||
| e200b5c566 |
@@ -109,7 +109,7 @@ func run(c *cli.Context) error {
|
|||||||
Tags: c.StringSlice("tags"),
|
Tags: c.StringSlice("tags"),
|
||||||
Args: c.StringSlice("args"),
|
Args: c.StringSlice("args"),
|
||||||
Target: c.String("target"),
|
Target: c.String("target"),
|
||||||
Repo: c.String("repo"),
|
Repo: fmt.Sprintf("%s/%s", c.String("registry"), c.String("repo")),
|
||||||
Labels: c.StringSlice("custom-labels"),
|
Labels: c.StringSlice("custom-labels"),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
// GCR JSON key file path
|
// GCR JSON key file path
|
||||||
gcrKeyPath string = "/kaniko/gcr.json"
|
gcrKeyPath string = "/kaniko/config.json"
|
||||||
gcrEnvVariable string = "GOOGLE_APPLICATION_CREDENTIALS"
|
gcrEnvVariable string = "GOOGLE_APPLICATION_CREDENTIALS"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:amd64-v1.3.0
|
FROM gcr.io/kaniko-project/executor:v1.3.0
|
||||||
|
|
||||||
ENV HOME /root
|
|
||||||
ENV USER root
|
|
||||||
|
|
||||||
ADD release/linux/amd64/kaniko-docker /kaniko/
|
ADD release/linux/amd64/kaniko-docker /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-docker"]
|
ENTRYPOINT ["/kaniko/kaniko-docker"]
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:amd64-v1.3.0
|
FROM gcr.io/kaniko-project/executor:v1.3.0
|
||||||
|
|
||||||
ENV HOME /root
|
|
||||||
ENV USER root
|
|
||||||
|
|
||||||
ADD release/linux/amd64/kaniko-ecr /kaniko/
|
ADD release/linux/amd64/kaniko-ecr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-ecr"]
|
ENTRYPOINT ["/kaniko/kaniko-ecr"]
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:amd64-v1.3.0
|
FROM gcr.io/kaniko-project/executor:v1.3.0
|
||||||
|
|
||||||
ENV HOME /root
|
|
||||||
ENV USER root
|
|
||||||
|
|
||||||
ADD release/linux/amd64/kaniko-gcr /kaniko/
|
ADD release/linux/amd64/kaniko-gcr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-gcr"]
|
ENTRYPOINT ["/kaniko/kaniko-gcr"]
|
||||||
@@ -46,7 +46,7 @@ func (p Plugin) Exec() error {
|
|||||||
}
|
}
|
||||||
// Set the labels
|
// Set the labels
|
||||||
for _, label := range p.Build.Labels {
|
for _, label := range p.Build.Labels {
|
||||||
cmdArgs = append(cmdArgs, fmt.Sprintf("--label %s", label))
|
cmdArgs = append(cmdArgs, fmt.Sprintf("--label=%s", label))
|
||||||
}
|
}
|
||||||
|
|
||||||
if p.Build.Target != "" {
|
if p.Build.Target != "" {
|
||||||
|
|||||||
Regular → Executable
Reference in New Issue
Block a user