Compare commits

..

4 Commits

Author SHA1 Message Date
Shubham Agrawal cdd1510210 Log error if dockerfile does not exist at provided path 2021-01-29 14:39:06 +05:30
Shubham Agrawal fa7726153d Merge pull request #8 from drone/ecr_iam
Make access key & secret optional in case of iam role usage on EKS cluster
2021-01-20 00:28:57 +05:30
Shubham Agrawal 49309bfa42 Make access key & secret optional in case of iam role usage on EKS cluster 2021-01-20 00:25:23 +05:30
Shubham Agrawal 428642719b Merge pull request #7 from drone/fix_label
Fix label usage
2021-01-18 21:15:01 +05:30
2 changed files with 15 additions and 14 deletions
+11 -14
View File
@@ -117,28 +117,25 @@ func run(c *cli.Context) error {
}
func setupECRAuth(accessKey, secretKey, registry string) error {
if accessKey == "" {
return fmt.Errorf("Access key must be specified")
}
if secretKey == "" {
return fmt.Errorf("Secret key must be specified")
}
if registry == "" {
return fmt.Errorf("Registry must be specified")
}
err := os.Setenv(accessKeyEnv, accessKey)
if err != nil {
return errors.Wrap(err, fmt.Sprintf("failed to set %s environment variable", accessKeyEnv))
}
// If IAM role is used, access key & secret key are not required
if accessKey != "" && secretKey != "" {
err := os.Setenv(accessKeyEnv, accessKey)
if err != nil {
return errors.Wrap(err, fmt.Sprintf("failed to set %s environment variable", accessKeyEnv))
}
err = os.Setenv(secretKeyEnv, secretKey)
if err != nil {
return errors.Wrap(err, fmt.Sprintf("failed to set %s environment variable", secretKeyEnv))
err = os.Setenv(secretKeyEnv, secretKey)
if err != nil {
return errors.Wrap(err, fmt.Sprintf("failed to set %s environment variable", secretKeyEnv))
}
}
jsonBytes := []byte(fmt.Sprintf(`{"credStore": "ecr-login", "credHelpers": {"%s": "ecr-login"}}`, registry))
err = ioutil.WriteFile(dockerConfigPath, jsonBytes, 0644)
err := ioutil.WriteFile(dockerConfigPath, jsonBytes, 0644)
if err != nil {
return errors.Wrap(err, "failed to create docker config file")
}
+4
View File
@@ -31,6 +31,10 @@ func (p Plugin) Exec() error {
return fmt.Errorf("repository name to publish image must be specified")
}
if _, err := os.Stat(p.Build.Dockerfile); os.IsNotExist(err) {
return fmt.Errorf("dockerfile does not exist at path: %s", p.Build.Dockerfile)
}
cmdArgs := []string{
fmt.Sprintf("--dockerfile=%s", p.Build.Dockerfile),
fmt.Sprintf("--context=dir://%s", p.Build.Context),