Making prepend of registry url to repo name optional (#48 )

Remove prepending of v1RegistryURL to the repo (#47 )
* Default registry value is not but v1RegistryURL * Handle test (not sure about its relevancy Co-authored-by: Ymage <heltem+git@o2php.com>
2026-06-16 14:49:02 +08:00 · 2022-04-05 14:39:12 +05:30 · 2022-04-04 10:58:10 +05:30 · 2022-03-31 16:24:40 +05:30 · 2022-03-31 15:39:44 +05:30 · 2022-03-31 15:32:23 +05:30
9 changed files with 166 additions and 6 deletions
@@ -60,6 +60,56 @@ steps:
      exclude:
      - pull_request

+- name: docker-kaniko-v1-8
+  image: plugins/docker
+  settings:
+    repo: plugins/kaniko
+    auto_tag: true
+    auto_tag_suffix: linux-amd64-kaniko1.8.0
+    daemon_off: false
+    dockerfile: docker/docker/Dockerfile.linux.amd64.kaniko1.8.0
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+  when:
+    event:
+      exclude:
+      - pull_request
+
+- name: gcr-kaniko-v1-8
+  image: plugins/docker
+  settings:
+    repo: plugins/kaniko-gcr
+    auto_tag: true
+    auto_tag_suffix: linux-amd64-kaniko1.8.0
+    daemon_off: false
+    dockerfile: docker/gcr/Dockerfile.linux.amd64.kaniko1.8.0
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+  when:
+    event:
+      exclude:
+      - pull_request
+
+- name: ecr-kaniko-v1-8
+  image: plugins/docker
+  settings:
+    repo: plugins/kaniko-ecr
+    auto_tag: true
+    auto_tag_suffix: linux-amd64-kaniko1.8.0
+    daemon_off: false
+    dockerfile: docker/ecr/Dockerfile.linux.amd64.kaniko1.8.0
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+  when:
+    event:
+      exclude:
+      - pull_request
 ---
 kind: pipeline
 type: docker
@@ -113,3 +163,57 @@ trigger:

 depends_on:
 - default
+
+---
+kind: pipeline
+type: docker
+name: notifications-docker-kaniko1-8
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: manifest-docker
+  pull: always
+  image: plugins/manifest
+  settings:
+    auto_tag: false
+    ignore_missing: true
+    password:
+      from_secret: docker_password
+    spec: docker/docker/manifest-kaniko1.8.0.tmpl
+    username:
+      from_secret: docker_username
+
+- name: manifest-gcr
+  pull: always
+  image: plugins/manifest
+  settings:
+    auto_tag: false
+    ignore_missing: true
+    password:
+      from_secret: docker_password
+    spec: docker/gcr/manifest-kaniko1.8.0.tmpl
+    username:
+      from_secret: docker_username
+
+- name: manifest-ecr
+  pull: always
+  image: plugins/manifest
+  settings:
+    auto_tag: false
+    ignore_missing: true
+    password:
+      from_secret: docker_password
+    spec: docker/ecr/manifest-kaniko1.8.0.tmpl
+    username:
+      from_secret: docker_username
+
+trigger:
+  ref:
+  - refs/heads/main
+  - "refs/tags/**"
+
+depends_on:
+- default
@@ -75,6 +75,11 @@ func main() {
 			EnvVar:   "PLUGIN_TAGS",
 			FilePath: ".tags",
 		},
+		cli.BoolFlag{
+			Name:   "expand-repo",
+			Usage:  "Prepends the registry url to the repo if registry url is not specified in repo name",
+			EnvVar: "PLUGIN_EXPAND_REPO",
+		},
 		cli.BoolFlag{
 			Name:   "expand-tag",
 			Usage:  "enable for semver tagging",
@@ -206,13 +211,13 @@ func run(c *cli.Context) error {
 			ExpandTag:       c.Bool("expand-tag"),
 			Args:            c.StringSlice("args"),
 			Target:          c.String("target"),
-			Repo:            buildRepo(c.String("registry"), c.String("repo")),
+			Repo:            buildRepo(c.String("registry"), c.String("repo"), c.Bool("expand-repo")),
 			Mirrors:         c.StringSlice("registry-mirrors"),
 			Labels:          c.StringSlice("custom-labels"),
 			SkipTlsVerify:   c.Bool("skip-tls-verify"),
 			SnapshotMode:    c.String("snapshot-mode"),
 			EnableCache:     c.Bool("enable-cache"),
-			CacheRepo:       buildRepo(c.String("registry"), c.String("cache-repo")),
+			CacheRepo:       buildRepo(c.String("registry"), c.String("cache-repo"), c.Bool("expand-repo")),
 			CacheTTL:        c.Int("cache-ttl"),
 			DigestFile:      defaultDigestFile,
 			NoPush:          noPush,
@@ -221,7 +226,7 @@ func run(c *cli.Context) error {
 		},
 		Artifact: kaniko.Artifact{
 			Tags:         c.StringSlice("tags"),
-			Repo:         buildRepo(c.String("registry"), c.String("repo")),
+			Repo:         buildRepo(c.String("registry"), c.String("repo"), c.Bool("expand-repo")),
 			Registry:     c.String("registry"),
 			ArtifactFile: c.String("artifact-file"),
 			RegistryType: artifact.Docker,
@@ -263,8 +268,8 @@ func createDockerCfgFile(username, password, registry string) error {
 	return nil
 }

-func buildRepo(registry, repo string) string {
-	if registry == "" {
+func buildRepo(registry, repo string, expandRepo bool) string {
+	if !expandRepo || registry == "" || registry == v1RegistryURL {
 		// No custom registry, just return the repo name
 		return repo
 	}
@@ -29,7 +29,7 @@ func Test_buildRepo(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := buildRepo(tt.registry, tt.repo); got != tt.want {
+			if got := buildRepo(tt.registry, tt.repo, true); got != tt.want {
 				t.Errorf("buildRepo(%q, %q) = %v, want %v", tt.registry, tt.repo, got, tt.want)
 			}
 		})
@@ -0,0 +1,4 @@
+FROM gcr.io/kaniko-project/executor:v1.8.0
+
+ADD release/linux/amd64/kaniko-docker /kaniko/
+ENTRYPOINT ["/kaniko/kaniko-docker"]
@@ -0,0 +1,13 @@
+image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-kaniko1.8.0{{else}}latest-kaniko1.8.0{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-kaniko1.8.0
+    platform:
+      architecture: amd64
+      os: linux
@@ -0,0 +1,4 @@
+FROM gcr.io/kaniko-project/executor:v1.8.0
+
+ADD release/linux/amd64/kaniko-ecr /kaniko/
+ENTRYPOINT ["/kaniko/kaniko-ecr"]
@@ -0,0 +1,13 @@
+image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-kaniko1.8.0{{else}}latest-kaniko1.8.0{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-kaniko1.8.0
+    platform:
+      architecture: amd64
+      os: linux
@@ -0,0 +1,4 @@
+FROM gcr.io/kaniko-project/executor:v1.8.0
+
+ADD release/linux/amd64/kaniko-gcr /kaniko/
+ENTRYPOINT ["/kaniko/kaniko-gcr"]
@@ -0,0 +1,13 @@
+image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-kaniko1.8.0{{else}}latest-kaniko1.8.0{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-kaniko1.8.0
+    platform:
+      architecture: amd64
+      os: linux
Author	SHA1	Message	Date
Shubham Agrawal	c39a1155b5	Making prepend of registry url to repo name optional (#48 )	2022-04-05 14:39:12 +05:30
ymage	ea64d40995	Remove prepending of v1RegistryURL to the repo (#47 ) * Default registry value is not but v1RegistryURL * Handle test (not sure about its relevancy Co-authored-by: Ymage <heltem+git@o2php.com>	2022-04-04 10:58:10 +05:30
Shubham Agrawal	0cd3e162fa	Remove auto tagging for version 1.8 (#46 )	2022-03-31 16:24:40 +05:30
Shubham Agrawal	f492271f45	Fix manifest yml (#45 )	2022-03-31 15:39:44 +05:30
Shubham Agrawal	7c6c33d174	Fix drone yml (#44 )	2022-03-31 15:32:23 +05:30
Shubham Agrawal	a11da49965	Publish plugin with latest kaniko 1.8.0 image (#43 )	2022-03-31 14:53:50 +05:30