mirror of
https://github.com/drone/drone-kaniko.git
synced 2026-06-14 05:12:26 +08:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ed8ef9156e |
+6
-5
@@ -4,7 +4,7 @@ name: default
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build
|
- name: build
|
||||||
image: golang:1.19
|
image: golang:1.18
|
||||||
commands:
|
commands:
|
||||||
- go test ./...
|
- go test ./...
|
||||||
- sh scripts/build.sh
|
- sh scripts/build.sh
|
||||||
@@ -130,15 +130,16 @@ steps:
|
|||||||
- pull_request
|
- pull_request
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: vm
|
type: docker
|
||||||
name: arm
|
name: arm
|
||||||
|
|
||||||
pool:
|
platform:
|
||||||
use: ubuntu_arm64
|
os: linux
|
||||||
|
arch: arm64
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build
|
- name: build
|
||||||
image: golang:1.19
|
image: golang:1.18
|
||||||
commands:
|
commands:
|
||||||
- go test ./...
|
- go test ./...
|
||||||
- sh scripts/build.sh
|
- sh scripts/build.sh
|
||||||
|
|||||||
@@ -176,11 +176,6 @@ func main() {
|
|||||||
Usage: "Set this flag if you only want to build the image, without pushing to a registry",
|
Usage: "Set this flag if you only want to build the image, without pushing to a registry",
|
||||||
EnvVar: "PLUGIN_NO_PUSH",
|
EnvVar: "PLUGIN_NO_PUSH",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
|
||||||
Name: "tar-path",
|
|
||||||
Usage: "Set this flag to save the image as a tarball at path",
|
|
||||||
EnvVar: "PLUGIN_TAR_PATH",
|
|
||||||
},
|
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "verbosity",
|
Name: "verbosity",
|
||||||
Usage: "Set this flag with value as oneof <panic|fatal|error|warn|info|debug|trace> to set the logging level for kaniko. Defaults to info.",
|
Usage: "Set this flag with value as oneof <panic|fatal|error|warn|info|debug|trace> to set the logging level for kaniko. Defaults to info.",
|
||||||
@@ -196,11 +191,6 @@ func main() {
|
|||||||
Usage: "build only used stages",
|
Usage: "build only used stages",
|
||||||
EnvVar: "PLUGIN_SKIP_UNUSED_STAGES",
|
EnvVar: "PLUGIN_SKIP_UNUSED_STAGES",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
|
||||||
Name: "output-file",
|
|
||||||
Usage: "Output file location that will be generated by the plugin. This file will include information of the output that are exported by the plugin.",
|
|
||||||
EnvVar: "DRONE_OUTPUT",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := app.Run(os.Args); err != nil {
|
if err := app.Run(os.Args); err != nil {
|
||||||
@@ -247,7 +237,6 @@ func run(c *cli.Context) error {
|
|||||||
CacheTTL: c.Int("cache-ttl"),
|
CacheTTL: c.Int("cache-ttl"),
|
||||||
DigestFile: defaultDigestFile,
|
DigestFile: defaultDigestFile,
|
||||||
NoPush: noPush,
|
NoPush: noPush,
|
||||||
TarPath: c.String("tar-path"),
|
|
||||||
Verbosity: c.String("verbosity"),
|
Verbosity: c.String("verbosity"),
|
||||||
Platform: c.String("platform"),
|
Platform: c.String("platform"),
|
||||||
SkipUnusedStages: c.Bool("skip-unused-stages"),
|
SkipUnusedStages: c.Bool("skip-unused-stages"),
|
||||||
@@ -259,9 +248,6 @@ func run(c *cli.Context) error {
|
|||||||
ArtifactFile: c.String("artifact-file"),
|
ArtifactFile: c.String("artifact-file"),
|
||||||
RegistryType: artifact.Docker,
|
RegistryType: artifact.Docker,
|
||||||
},
|
},
|
||||||
Output: kaniko.Output{
|
|
||||||
OutputFile: c.String("output-file"),
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
return plugin.Exec()
|
return plugin.Exec()
|
||||||
}
|
}
|
||||||
|
|||||||
+55
-126
@@ -17,7 +17,6 @@ import (
|
|||||||
"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
|
"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
|
||||||
"github.com/aws/aws-sdk-go/aws/session"
|
"github.com/aws/aws-sdk-go/aws/session"
|
||||||
ecrv1 "github.com/aws/aws-sdk-go/service/ecr"
|
ecrv1 "github.com/aws/aws-sdk-go/service/ecr"
|
||||||
ecrpublicv1 "github.com/aws/aws-sdk-go/service/ecrpublic"
|
|
||||||
"github.com/aws/smithy-go"
|
"github.com/aws/smithy-go"
|
||||||
"github.com/hashicorp/go-version"
|
"github.com/hashicorp/go-version"
|
||||||
"github.com/joho/godotenv"
|
"github.com/joho/godotenv"
|
||||||
@@ -65,11 +64,6 @@ func main() {
|
|||||||
Value: "Dockerfile",
|
Value: "Dockerfile",
|
||||||
EnvVar: "PLUGIN_DOCKERFILE",
|
EnvVar: "PLUGIN_DOCKERFILE",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
|
||||||
Name: "docker-registry",
|
|
||||||
Usage: "docker registry",
|
|
||||||
EnvVar: "PLUGIN_DOCKER_REGISTRY,DOCKER_REGISTRY",
|
|
||||||
},
|
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "docker-username",
|
Name: "docker-username",
|
||||||
Usage: "docker username",
|
Usage: "docker username",
|
||||||
@@ -246,18 +240,15 @@ func run(c *cli.Context) error {
|
|||||||
registry := c.String("registry")
|
registry := c.String("registry")
|
||||||
region := c.String("region")
|
region := c.String("region")
|
||||||
noPush := c.Bool("no-push")
|
noPush := c.Bool("no-push")
|
||||||
assumeRole := c.String("assume-role")
|
|
||||||
externalId := c.String("external-id")
|
|
||||||
|
|
||||||
dockerConfig, err := createDockerConfig(
|
dockerConfig, err := createDockerConfig(
|
||||||
c.String("docker-registry"),
|
|
||||||
c.String("docker-username"),
|
c.String("docker-username"),
|
||||||
c.String("docker-password"),
|
c.String("docker-password"),
|
||||||
c.String("access-key"),
|
c.String("access-key"),
|
||||||
c.String("secret-key"),
|
c.String("secret-key"),
|
||||||
registry,
|
registry,
|
||||||
assumeRole,
|
c.String("assume-role"),
|
||||||
externalId,
|
c.String("external-id"),
|
||||||
region,
|
region,
|
||||||
noPush,
|
noPush,
|
||||||
)
|
)
|
||||||
@@ -276,7 +267,7 @@ func run(c *cli.Context) error {
|
|||||||
|
|
||||||
// only create repository when pushing and create-repository is true
|
// only create repository when pushing and create-repository is true
|
||||||
if !noPush && c.Bool("create-repository") {
|
if !noPush && c.Bool("create-repository") {
|
||||||
if err := createRepository(region, repo, registry, assumeRole, externalId); err != nil {
|
if err := createRepository(region, repo, registry); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -286,7 +277,7 @@ func run(c *cli.Context) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if err := uploadLifeCyclePolicy(region, repo, string(contents), assumeRole, externalId); err != nil {
|
if err := uploadLifeCyclePolicy(region, repo, string(contents)); err != nil {
|
||||||
logrus.Fatal(fmt.Sprintf("error uploading ECR lifecycle policy: %v", err))
|
logrus.Fatal(fmt.Sprintf("error uploading ECR lifecycle policy: %v", err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -296,7 +287,7 @@ func run(c *cli.Context) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if err := uploadRepositoryPolicy(region, repo, registry, string(contents), assumeRole, externalId); err != nil {
|
if err := uploadRepositoryPolicy(region, repo, registry, string(contents)); err != nil {
|
||||||
logrus.Fatal(fmt.Sprintf("error uploading ECR lifecycle policy: %v", err))
|
logrus.Fatal(fmt.Sprintf("error uploading ECR lifecycle policy: %v", err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -337,16 +328,12 @@ func run(c *cli.Context) error {
|
|||||||
return plugin.Exec()
|
return plugin.Exec()
|
||||||
}
|
}
|
||||||
|
|
||||||
func createDockerConfig(dockerRegistry, dockerUsername, dockerPassword, accessKey, secretKey,
|
func createDockerConfig(dockerUsername, dockerPassword, accessKey, secretKey,
|
||||||
registry, assumeRole, externalId, region string, noPush bool) (*docker.Config, error) {
|
registry, assumeRole, externalId, region string, noPush bool) (*docker.Config, error) {
|
||||||
dockerConfig := docker.NewConfig()
|
dockerConfig := docker.NewConfig()
|
||||||
|
|
||||||
if dockerUsername != "" {
|
if dockerUsername != "" {
|
||||||
// if no docker registry provided, use dockerhub by default
|
dockerConfig.SetAuth(docker.RegistryV1, dockerUsername, dockerPassword)
|
||||||
if len(dockerRegistry) == 0 {
|
|
||||||
dockerRegistry = docker.RegistryV1
|
|
||||||
}
|
|
||||||
dockerConfig.SetAuth(dockerRegistry, dockerUsername, dockerPassword)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if assumeRole != "" {
|
if assumeRole != "" {
|
||||||
@@ -386,7 +373,7 @@ func createDockerConfig(dockerRegistry, dockerUsername, dockerPassword, accessKe
|
|||||||
return dockerConfig, nil
|
return dockerConfig, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func createRepository(region, repo, registry, assumeRole, externalId string) error {
|
func createRepository(region, repo, registry string) error {
|
||||||
if registry == "" {
|
if registry == "" {
|
||||||
return fmt.Errorf("registry must be specified")
|
return fmt.Errorf("registry must be specified")
|
||||||
}
|
}
|
||||||
@@ -395,29 +382,22 @@ func createRepository(region, repo, registry, assumeRole, externalId string) err
|
|||||||
return fmt.Errorf("repo must be specified")
|
return fmt.Errorf("repo must be specified")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithRegion(region))
|
||||||
|
if err != nil {
|
||||||
|
return errors.Wrap(err, "failed to load aws config")
|
||||||
|
}
|
||||||
|
|
||||||
var createErr error
|
var createErr error
|
||||||
|
|
||||||
if assumeRole != "" {
|
//create public repo
|
||||||
if isRegistryPublic(registry) {
|
//if registry string starts with public domain (ex: public.ecr.aws/example-registry)
|
||||||
_, createErr = getAssumeRoleEcrPublicSvc(region, assumeRole, externalId).CreateRepository(&ecrpublicv1.CreateRepositoryInput{RepositoryName: &repo})
|
if isRegistryPublic(registry) {
|
||||||
} else {
|
svc := ecrpublic.NewFromConfig(cfg)
|
||||||
_, createErr = getAssumeRoleEcrSvc(region, assumeRole, externalId).CreateRepository(&ecrv1.CreateRepositoryInput{RepositoryName: &repo})
|
_, createErr = svc.CreateRepository(context.TODO(), &ecrpublic.CreateRepositoryInput{RepositoryName: &repo})
|
||||||
}
|
//create private repo
|
||||||
} else {
|
} else {
|
||||||
cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithRegion(region))
|
svc := ecr.NewFromConfig(cfg)
|
||||||
if err != nil {
|
_, createErr = svc.CreateRepository(context.TODO(), &ecr.CreateRepositoryInput{RepositoryName: &repo})
|
||||||
return errors.Wrap(err, "failed to load aws config")
|
|
||||||
}
|
|
||||||
//create public repo
|
|
||||||
//if registry string starts with public domain (ex: public.ecr.aws/example-registry)
|
|
||||||
if isRegistryPublic(registry) {
|
|
||||||
svc := ecrpublic.NewFromConfig(cfg)
|
|
||||||
_, createErr = svc.CreateRepository(context.TODO(), &ecrpublic.CreateRepositoryInput{RepositoryName: &repo})
|
|
||||||
//create private repo
|
|
||||||
} else {
|
|
||||||
svc := ecr.NewFromConfig(cfg)
|
|
||||||
_, createErr = svc.CreateRepository(context.TODO(), &ecr.CreateRepositoryInput{RepositoryName: &repo})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var apiError smithy.APIError
|
var apiError smithy.APIError
|
||||||
@@ -428,67 +408,46 @@ func createRepository(region, repo, registry, assumeRole, externalId string) err
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func uploadLifeCyclePolicy(region, repo, lifecyclePolicy, assumeRole, externalId string) (err error) {
|
func uploadLifeCyclePolicy(region, repo, lifecyclePolicy string) (err error) {
|
||||||
if assumeRole != "" {
|
cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithRegion(region))
|
||||||
input := &ecrv1.PutLifecyclePolicyInput{
|
if err != nil {
|
||||||
LifecyclePolicyText: aws.String(lifecyclePolicy),
|
return errors.Wrap(err, "failed to load aws config")
|
||||||
RepositoryName: aws.String(repo),
|
|
||||||
}
|
|
||||||
_, err = getAssumeRoleEcrSvc(region, assumeRole, externalId).PutLifecyclePolicy(input)
|
|
||||||
} else {
|
|
||||||
cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithRegion(region))
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrap(err, "failed to load aws config")
|
|
||||||
}
|
|
||||||
|
|
||||||
svc := ecr.NewFromConfig(cfg)
|
|
||||||
|
|
||||||
input := &ecr.PutLifecyclePolicyInput{
|
|
||||||
LifecyclePolicyText: aws.String(lifecyclePolicy),
|
|
||||||
RepositoryName: aws.String(repo),
|
|
||||||
}
|
|
||||||
_, err = svc.PutLifecyclePolicy(context.TODO(), input)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
svc := ecr.NewFromConfig(cfg)
|
||||||
|
|
||||||
|
input := &ecr.PutLifecyclePolicyInput{
|
||||||
|
LifecyclePolicyText: aws.String(lifecyclePolicy),
|
||||||
|
RepositoryName: aws.String(repo),
|
||||||
|
}
|
||||||
|
_, err = svc.PutLifecyclePolicy(context.TODO(), input)
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func uploadRepositoryPolicy(region, repo, registry, repositoryPolicy, assumeRole, externalId string) (err error) {
|
func uploadRepositoryPolicy(region, repo, registry, repositoryPolicy string) (err error) {
|
||||||
if assumeRole != "" {
|
cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithRegion(region))
|
||||||
if isRegistryPublic(registry) {
|
if err != nil {
|
||||||
input := &ecrpublicv1.SetRepositoryPolicyInput{
|
return errors.Wrap(err, "failed to load aws config")
|
||||||
PolicyText: aws.String(repositoryPolicy),
|
}
|
||||||
RepositoryName: aws.String(repo),
|
|
||||||
}
|
|
||||||
_, err = getAssumeRoleEcrPublicSvc(region, assumeRole, externalId).SetRepositoryPolicy(input)
|
|
||||||
} else {
|
|
||||||
input := &ecrv1.SetRepositoryPolicyInput{
|
|
||||||
PolicyText: aws.String(repositoryPolicy),
|
|
||||||
RepositoryName: aws.String(repo),
|
|
||||||
}
|
|
||||||
_, err = getAssumeRoleEcrSvc(region, assumeRole, externalId).SetRepositoryPolicy(input)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithRegion(region))
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrap(err, "failed to load aws config")
|
|
||||||
}
|
|
||||||
|
|
||||||
if isRegistryPublic(registry) {
|
if isRegistryPublic(registry) {
|
||||||
svc := ecrpublic.NewFromConfig(cfg)
|
svc := ecrpublic.NewFromConfig(cfg)
|
||||||
input := &ecrpublic.SetRepositoryPolicyInput{
|
|
||||||
PolicyText: aws.String(repositoryPolicy),
|
input := &ecrpublic.SetRepositoryPolicyInput{
|
||||||
RepositoryName: aws.String(repo),
|
PolicyText: aws.String(repositoryPolicy),
|
||||||
}
|
RepositoryName: aws.String(repo),
|
||||||
_, err = svc.SetRepositoryPolicy(context.TODO(), input)
|
|
||||||
} else {
|
|
||||||
svc := ecr.NewFromConfig(cfg)
|
|
||||||
input := &ecr.SetRepositoryPolicyInput{
|
|
||||||
PolicyText: aws.String(repositoryPolicy),
|
|
||||||
RepositoryName: aws.String(repo),
|
|
||||||
}
|
|
||||||
_, err = svc.SetRepositoryPolicy(context.TODO(), input)
|
|
||||||
}
|
}
|
||||||
|
_, err = svc.SetRepositoryPolicy(context.TODO(), input)
|
||||||
|
} else {
|
||||||
|
|
||||||
|
svc := ecr.NewFromConfig(cfg)
|
||||||
|
|
||||||
|
input := &ecr.SetRepositoryPolicyInput{
|
||||||
|
PolicyText: aws.String(repositoryPolicy),
|
||||||
|
RepositoryName: aws.String(repo),
|
||||||
|
}
|
||||||
|
_, err = svc.SetRepositoryPolicy(context.TODO(), input)
|
||||||
}
|
}
|
||||||
|
|
||||||
return err
|
return err
|
||||||
@@ -510,7 +469,7 @@ func getAssumeRoleCreds(region, roleArn, externalId, roleSessionName string) (st
|
|||||||
|
|
||||||
username, password, registry, err := getAuthInfo(svc)
|
username, password, registry, err := getAuthInfo(svc)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", "", "", errors.Wrap(err, "failed to get ECR auth: no basic auth credentials")
|
return "", "", "", errors.Wrap(err, "failed to get ECR auth")
|
||||||
}
|
}
|
||||||
return username, password, registry, nil
|
return username, password, registry, nil
|
||||||
}
|
}
|
||||||
@@ -538,36 +497,6 @@ func getAuthInfo(svc *ecrv1.ECR) (username, password, registry string, err error
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func getAssumeRoleEcrSvc(region, assumeRole, externalId string) *ecrv1.ECR {
|
|
||||||
sess, err := session.NewSession(&awsv1.Config{Region: ®ion})
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err, "failed to create aws session")
|
|
||||||
}
|
|
||||||
|
|
||||||
return ecrv1.New(sess, &awsv1.Config{
|
|
||||||
Credentials: stscreds.NewCredentials(sess, assumeRole, func(p *stscreds.AssumeRoleProvider) {
|
|
||||||
if externalId != "" {
|
|
||||||
p.ExternalID = &externalId
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func getAssumeRoleEcrPublicSvc(region, assumeRole, externalId string) *ecrpublicv1.ECRPublic {
|
|
||||||
sess, err := session.NewSession(&awsv1.Config{Region: ®ion})
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err, "failed to create aws session")
|
|
||||||
}
|
|
||||||
|
|
||||||
return ecrpublicv1.New(sess, &awsv1.Config{
|
|
||||||
Credentials: stscreds.NewCredentials(sess, assumeRole, func(p *stscreds.AssumeRoleProvider) {
|
|
||||||
if externalId != "" {
|
|
||||||
p.ExternalID = &externalId
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func isRegistryPublic(registry string) bool {
|
func isRegistryPublic(registry string) bool {
|
||||||
return strings.HasPrefix(registry, ecrPublicDomain)
|
return strings.HasPrefix(registry, ecrPublicDomain)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import (
|
|||||||
|
|
||||||
func TestCreateDockerConfig(t *testing.T) {
|
func TestCreateDockerConfig(t *testing.T) {
|
||||||
got, err := createDockerConfig(
|
got, err := createDockerConfig(
|
||||||
"",
|
|
||||||
"docker-username",
|
"docker-username",
|
||||||
"docker-password",
|
"docker-password",
|
||||||
"access-key",
|
"access-key",
|
||||||
@@ -35,37 +34,10 @@ func TestCreateDockerConfig(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateDockerConfigFromGivenRegistry(t *testing.T) {
|
|
||||||
got, err := createDockerConfig(
|
|
||||||
"docker-registry",
|
|
||||||
"docker-username",
|
|
||||||
"docker-password",
|
|
||||||
"access-key",
|
|
||||||
"secret-key",
|
|
||||||
"ecr-registry",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
false,
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
t.Error("failed to create docker config")
|
|
||||||
}
|
|
||||||
|
|
||||||
want := docker.NewConfig()
|
|
||||||
want.SetAuth("docker-registry", "docker-username", "docker-password")
|
|
||||||
want.SetCredHelper(docker.RegistryECRPublic, "ecr-login")
|
|
||||||
want.SetCredHelper("ecr-registry", "ecr-login")
|
|
||||||
if !reflect.DeepEqual(want, got) {
|
|
||||||
t.Errorf("not equal:\n want: %#v\n got: %#v", want, got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCreateDockerConfigKanikoOneDotEight(t *testing.T) {
|
func TestCreateDockerConfigKanikoOneDotEight(t *testing.T) {
|
||||||
os.Setenv(kanikoVersionEnv, "1.8.1")
|
os.Setenv(kanikoVersionEnv, "1.8.1")
|
||||||
defer os.Setenv(kanikoVersionEnv, "")
|
defer os.Setenv(kanikoVersionEnv, "")
|
||||||
got, err := createDockerConfig(
|
got, err := createDockerConfig(
|
||||||
"",
|
|
||||||
"docker-username",
|
"docker-username",
|
||||||
"docker-password",
|
"docker-password",
|
||||||
"access-key",
|
"access-key",
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.8.1
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.8.1
|
||||||
ADD release/linux/amd64/kaniko-acr /kaniko/
|
ADD release/linux/amd64/kaniko-acr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-acr"]
|
ENTRYPOINT ["/kaniko/kaniko-acr"]
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.8.1
|
||||||
|
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
ENV USER root
|
ENV USER root
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.8.1
|
||||||
ADD release/linux/arm64/kaniko-acr /kaniko/
|
ADD release/linux/arm64/kaniko-acr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-acr"]
|
ENTRYPOINT ["/kaniko/kaniko-acr"]
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.6.0
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.6.0
|
||||||
ADD release/linux/amd64/kaniko-docker /kaniko/
|
ADD release/linux/amd64/kaniko-docker /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-docker"]
|
ENTRYPOINT ["/kaniko/kaniko-docker"]
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.6.0
|
||||||
|
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
ENV USER root
|
ENV USER root
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.6.0
|
||||||
ADD release/linux/arm64/kaniko-docker /kaniko/
|
ADD release/linux/arm64/kaniko-docker /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-docker"]
|
ENTRYPOINT ["/kaniko/kaniko-docker"]
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.6.0
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.6.0
|
||||||
ADD release/linux/amd64/kaniko-ecr /kaniko/
|
ADD release/linux/amd64/kaniko-ecr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-ecr"]
|
ENTRYPOINT ["/kaniko/kaniko-ecr"]
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.6.0
|
||||||
|
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
ENV USER root
|
ENV USER root
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.6.0
|
||||||
|
|
||||||
ADD release/linux/arm64/kaniko-ecr /kaniko/
|
ADD release/linux/arm64/kaniko-ecr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-ecr"]
|
ENTRYPOINT ["/kaniko/kaniko-ecr"]
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.6.0
|
||||||
|
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.6.0
|
||||||
ADD release/linux/amd64/kaniko-gcr /kaniko/
|
ADD release/linux/amd64/kaniko-gcr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-gcr"]
|
ENTRYPOINT ["/kaniko/kaniko-gcr"]
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
FROM gcr.io/kaniko-project/executor:v1.9.1
|
FROM gcr.io/kaniko-project/executor:v1.6.0
|
||||||
|
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
ENV USER root
|
ENV USER root
|
||||||
ENV KANIKO_VERSION=1.9.1
|
ENV KANIKO_VERSION=1.6.0
|
||||||
|
|
||||||
ADD release/linux/arm64/kaniko-gcr /kaniko/
|
ADD release/linux/arm64/kaniko-gcr /kaniko/
|
||||||
ENTRYPOINT ["/kaniko/kaniko-gcr"]
|
ENTRYPOINT ["/kaniko/kaniko-gcr"]
|
||||||
|
|||||||
@@ -43,4 +43,4 @@ require (
|
|||||||
golang.org/x/text v0.3.7 // indirect
|
golang.org/x/text v0.3.7 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
go 1.19
|
go 1.18
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/drone/drone-kaniko/pkg/artifact"
|
"github.com/drone/drone-kaniko/pkg/artifact"
|
||||||
"github.com/drone/drone-kaniko/pkg/output"
|
|
||||||
"github.com/drone/drone-kaniko/pkg/tagger"
|
"github.com/drone/drone-kaniko/pkg/tagger"
|
||||||
"golang.org/x/mod/semver"
|
"golang.org/x/mod/semver"
|
||||||
)
|
)
|
||||||
@@ -39,7 +38,6 @@ type (
|
|||||||
Verbosity string // Log level
|
Verbosity string // Log level
|
||||||
Platform string // Allows to build with another default platform than the host, similarly to docker build --platform
|
Platform string // Allows to build with another default platform than the host, similarly to docker build --platform
|
||||||
SkipUnusedStages bool // Build only used stages
|
SkipUnusedStages bool // Build only used stages
|
||||||
TarPath string // Set this flag to save the image as a tarball at path
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Artifact defines content of artifact file
|
// Artifact defines content of artifact file
|
||||||
@@ -51,16 +49,10 @@ type (
|
|||||||
ArtifactFile string // Artifact file location
|
ArtifactFile string // Artifact file location
|
||||||
}
|
}
|
||||||
|
|
||||||
// Output defines content of output file
|
|
||||||
Output struct {
|
|
||||||
OutputFile string // File where plugin output are saved
|
|
||||||
}
|
|
||||||
|
|
||||||
// Plugin defines the Docker plugin parameters.
|
// Plugin defines the Docker plugin parameters.
|
||||||
Plugin struct {
|
Plugin struct {
|
||||||
Build Build // Docker build configuration
|
Build Build // Docker build configuration
|
||||||
Artifact Artifact // Artifact file content
|
Artifact Artifact // Artifact file content
|
||||||
Output Output // Output file content
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -156,15 +148,14 @@ func (p Plugin) Exec() error {
|
|||||||
fmt.Sprintf("--context=dir://%s", p.Build.Context),
|
fmt.Sprintf("--context=dir://%s", p.Build.Context),
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set the destination repository only when we push or save to tarball
|
// Set the destination repository
|
||||||
if !p.Build.NoPush || p.Build.TarPath != "" {
|
if !p.Build.NoPush {
|
||||||
for _, tag := range tags {
|
for _, tag := range tags {
|
||||||
for _, label := range p.Build.labelsForTag(tag) {
|
for _, label := range p.Build.labelsForTag(tag) {
|
||||||
cmdArgs = append(cmdArgs, fmt.Sprintf("--destination=%s:%s", p.Build.Repo, label))
|
cmdArgs = append(cmdArgs, fmt.Sprintf("--destination=%s:%s", p.Build.Repo, label))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set the build arguments
|
// Set the build arguments
|
||||||
for _, arg := range p.Build.Args {
|
for _, arg := range p.Build.Args {
|
||||||
cmdArgs = append(cmdArgs, fmt.Sprintf("--build-arg=%s", arg))
|
cmdArgs = append(cmdArgs, fmt.Sprintf("--build-arg=%s", arg))
|
||||||
@@ -221,10 +212,6 @@ func (p Plugin) Exec() error {
|
|||||||
cmdArgs = append(cmdArgs, "--skip-unused-stages")
|
cmdArgs = append(cmdArgs, "--skip-unused-stages")
|
||||||
}
|
}
|
||||||
|
|
||||||
if p.Build.TarPath != "" {
|
|
||||||
cmdArgs = append(cmdArgs, fmt.Sprintf("--tar-path=%s", p.Build.TarPath))
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd := exec.Command("/kaniko/executor", cmdArgs...)
|
cmd := exec.Command("/kaniko/executor", cmdArgs...)
|
||||||
cmd.Stdout = os.Stdout
|
cmd.Stdout = os.Stdout
|
||||||
cmd.Stderr = os.Stderr
|
cmd.Stderr = os.Stderr
|
||||||
@@ -236,29 +223,19 @@ func (p Plugin) Exec() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if p.Build.DigestFile != "" && p.Artifact.ArtifactFile != "" {
|
if p.Build.DigestFile != "" && p.Artifact.ArtifactFile != "" {
|
||||||
err = artifact.WritePluginArtifactFile(p.Artifact.RegistryType, p.Artifact.ArtifactFile, p.Artifact.Registry, p.Artifact.Repo, getDigest(p.Build.DigestFile), p.Artifact.Tags)
|
content, err := ioutil.ReadFile(p.Build.DigestFile)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "failed to read digest file contents at path: %s with error: %s\n", p.Build.DigestFile, err)
|
||||||
|
}
|
||||||
|
err = artifact.WritePluginArtifactFile(p.Artifact.RegistryType, p.Artifact.ArtifactFile, p.Artifact.Registry, p.Artifact.Repo, string(content), p.Artifact.Tags)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "failed to write plugin artifact file at path: %s with error: %s\n", p.Artifact.ArtifactFile, err)
|
fmt.Fprintf(os.Stderr, "failed to write plugin artifact file at path: %s with error: %s\n", p.Artifact.ArtifactFile, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if p.Output.OutputFile != "" {
|
|
||||||
if err = output.WritePluginOutputFile(p.Output.OutputFile, getDigest(p.Build.DigestFile)); err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "failed to write plugin output file at path: %s with error: %s\n", p.Output.OutputFile, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func getDigest(digestFile string) string {
|
|
||||||
content, err := ioutil.ReadFile(digestFile)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "failed to read digest file contents at path: %s with error: %s\n", digestFile, err)
|
|
||||||
}
|
|
||||||
return string(content)
|
|
||||||
}
|
|
||||||
|
|
||||||
// trace writes each command to stdout with the command wrapped in an xml
|
// trace writes each command to stdout with the command wrapped in an xml
|
||||||
// tag so that it can be extracted and displayed in the logs.
|
// tag so that it can be extracted and displayed in the logs.
|
||||||
func trace(cmd *exec.Cmd) {
|
func trace(cmd *exec.Cmd) {
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
package output
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/joho/godotenv"
|
|
||||||
)
|
|
||||||
|
|
||||||
func WritePluginOutputFile(outputFilePath, digest string) error {
|
|
||||||
output := map[string]string{
|
|
||||||
"digest": digest,
|
|
||||||
}
|
|
||||||
return godotenv.Write(output, outputFilePath)
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user