From cd3745b3ca5a6c8cae5bb759be30fe0fb3486649 Mon Sep 17 00:00:00 2001 From: Aman Singh Date: Wed, 24 May 2023 15:52:18 +0530 Subject: [PATCH] fix: [CI-8113]: added kaniko 1.9.2 support (#83) * fix: [CI-8113]: added kaniko 1.9.2 support * fix: [CI-8113]: added kaniko 1.9.2 support --- .drone.yml | 30 +++++++++---------- README.md | 2 +- docker/acr/Dockerfile.linux.amd64 | 4 +-- docker/acr/Dockerfile.linux.arm64 | 4 +-- docker/docker/Dockerfile.linux.amd64 | 4 +-- ...9.1 => Dockerfile.linux.amd64.kaniko1.9.2} | 4 +-- docker/docker/Dockerfile.linux.arm64 | 4 +-- ...9.1 => Dockerfile.linux.arm64.kaniko1.9.2} | 4 +-- ...ko1.9.1.tmpl => manifest-kaniko1.9.2.tmpl} | 6 ++-- docker/ecr/Dockerfile.linux.amd64 | 4 +-- ...9.1 => Dockerfile.linux.amd64.kaniko1.9.2} | 4 +-- docker/ecr/Dockerfile.linux.arm64 | 4 +-- ...9.1 => Dockerfile.linux.arm64.kaniko1.9.2} | 4 +-- ...ko1.9.1.tmpl => manifest-kaniko1.9.2.tmpl} | 6 ++-- docker/gcr/Dockerfile.linux.amd64 | 4 +-- ...9.1 => Dockerfile.linux.amd64.kaniko1.9.2} | 4 +-- docker/gcr/Dockerfile.linux.arm64 | 4 +-- ...9.1 => Dockerfile.linux.arm64.kaniko1.9.2} | 4 +-- ...ko1.9.1.tmpl => manifest-kaniko1.9.2.tmpl} | 6 ++-- 19 files changed, 53 insertions(+), 53 deletions(-) rename docker/docker/{Dockerfile.linux.amd64.kaniko1.9.1 => Dockerfile.linux.amd64.kaniko1.9.2} (55%) rename docker/docker/{Dockerfile.linux.arm64.kaniko1.9.1 => Dockerfile.linux.arm64.kaniko1.9.2} (55%) rename docker/docker/{manifest-kaniko1.9.1.tmpl => manifest-kaniko1.9.2.tmpl} (75%) rename docker/ecr/{Dockerfile.linux.amd64.kaniko1.9.1 => Dockerfile.linux.amd64.kaniko1.9.2} (53%) rename docker/ecr/{Dockerfile.linux.arm64.kaniko1.9.1 => Dockerfile.linux.arm64.kaniko1.9.2} (53%) rename docker/ecr/{manifest-kaniko1.9.1.tmpl => manifest-kaniko1.9.2.tmpl} (74%) rename docker/gcr/{Dockerfile.linux.amd64.kaniko1.9.1 => Dockerfile.linux.amd64.kaniko1.9.2} (53%) rename docker/gcr/{Dockerfile.linux.arm64.kaniko1.9.1 => Dockerfile.linux.arm64.kaniko1.9.2} (53%) rename docker/gcr/{manifest-kaniko1.9.1.tmpl => manifest-kaniko1.9.2.tmpl} (74%) diff --git a/.drone.yml b/.drone.yml index cb01156..bca2a51 100644 --- a/.drone.yml +++ b/.drone.yml @@ -82,9 +82,9 @@ steps: settings: repo: plugins/kaniko auto_tag: true - auto_tag_suffix: linux-amd64-kaniko1.9.1 + auto_tag_suffix: linux-amd64-kaniko1.9.2 daemon_off: false - dockerfile: docker/docker/Dockerfile.linux.amd64.kaniko1.9.1 + dockerfile: docker/docker/Dockerfile.linux.amd64.kaniko1.9.2 username: from_secret: docker_username password: @@ -99,9 +99,9 @@ steps: settings: repo: plugins/kaniko-gcr auto_tag: true - auto_tag_suffix: linux-amd64-kaniko1.9.1 + auto_tag_suffix: linux-amd64-kaniko1.9.2 daemon_off: false - dockerfile: docker/gcr/Dockerfile.linux.amd64.kaniko1.9.1 + dockerfile: docker/gcr/Dockerfile.linux.amd64.kaniko1.9.2 username: from_secret: docker_username password: @@ -117,9 +117,9 @@ steps: settings: repo: plugins/kaniko-ecr auto_tag: true - auto_tag_suffix: linux-amd64-kaniko1.9.1 + auto_tag_suffix: linux-amd64-kaniko1.9.2 daemon_off: false - dockerfile: docker/ecr/Dockerfile.linux.amd64.kaniko1.9.1 + dockerfile: docker/ecr/Dockerfile.linux.amd64.kaniko1.9.2 username: from_secret: docker_username password: @@ -216,9 +216,9 @@ steps: settings: repo: plugins/kaniko auto_tag: true - auto_tag_suffix: linux-arm64-kaniko1.9.1 + auto_tag_suffix: linux-arm64-kaniko1.9.2 daemon_off: false - dockerfile: docker/docker/Dockerfile.linux.arm64.kaniko1.9.1 + dockerfile: docker/docker/Dockerfile.linux.arm64.kaniko1.9.2 username: from_secret: docker_username password: @@ -233,9 +233,9 @@ steps: settings: repo: plugins/kaniko-gcr auto_tag: true - auto_tag_suffix: linux-arm64-kaniko1.9.1 + auto_tag_suffix: linux-arm64-kaniko1.9.2 daemon_off: false - dockerfile: docker/gcr/Dockerfile.linux.arm64.kaniko1.9.1 + dockerfile: docker/gcr/Dockerfile.linux.arm64.kaniko1.9.2 username: from_secret: docker_username password: @@ -251,9 +251,9 @@ steps: settings: repo: plugins/kaniko-ecr auto_tag: true - auto_tag_suffix: linux-arm64-kaniko1.9.1 + auto_tag_suffix: linux-arm64-kaniko1.9.2 daemon_off: false - dockerfile: docker/ecr/Dockerfile.linux.arm64.kaniko1.9.1 + dockerfile: docker/ecr/Dockerfile.linux.arm64.kaniko1.9.2 username: from_secret: docker_username password: @@ -347,7 +347,7 @@ steps: ignore_missing: true password: from_secret: docker_password - spec: docker/docker/manifest-kaniko1.9.1.tmpl + spec: docker/docker/manifest-kaniko1.9.2.tmpl username: from_secret: docker_username @@ -359,7 +359,7 @@ steps: ignore_missing: true password: from_secret: docker_password - spec: docker/gcr/manifest-kaniko1.9.1.tmpl + spec: docker/gcr/manifest-kaniko1.9.2.tmpl username: from_secret: docker_username @@ -371,7 +371,7 @@ steps: ignore_missing: true password: from_secret: docker_password - spec: docker/ecr/manifest-kaniko1.9.1.tmpl + spec: docker/ecr/manifest-kaniko1.9.2.tmpl username: from_secret: docker_username diff --git a/README.md b/README.md index a1c46f6..9d7852b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Drone kaniko plugin uses [kaniko](https://github.com/GoogleContainerTools/kaniko) to build and publish Docker images to a container registry. -Plugin images are published with 1.6.0 as well as 1.9.1 kaniko version from 1.5.1 release tag. `plugins/kaniko:` uses 1.6.0 version while `plugins/kaniko:-kaniko1.9.1` uses 1.9.1 version. Similar convention is used for plugins/kaniko-ecr & plugins/kaniko-gcr images as well. +Plugin images are published with 1.6.0 as well as 1.9.2 kaniko version from 1.5.1 release tag. `plugins/kaniko:` uses 1.6.0 version while `plugins/kaniko:-kaniko1.9.2` uses 1.9.2 version. Similar convention is used for plugins/kaniko-ecr & plugins/kaniko-gcr images as well. ## Build diff --git a/docker/acr/Dockerfile.linux.amd64 b/docker/acr/Dockerfile.linux.amd64 index e8b05c5..8c9defe 100644 --- a/docker/acr/Dockerfile.linux.amd64 +++ b/docker/acr/Dockerfile.linux.amd64 @@ -1,5 +1,5 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/amd64/kaniko-acr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-acr"] diff --git a/docker/acr/Dockerfile.linux.arm64 b/docker/acr/Dockerfile.linux.arm64 index c290f2e..6982cca 100644 --- a/docker/acr/Dockerfile.linux.arm64 +++ b/docker/acr/Dockerfile.linux.arm64 @@ -1,8 +1,8 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 ENV HOME /root ENV USER root -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/arm64/kaniko-acr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-acr"] diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index a446f17..bdfa8df 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -1,5 +1,5 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/amd64/kaniko-docker /kaniko/ ENTRYPOINT ["/kaniko/kaniko-docker"] diff --git a/docker/docker/Dockerfile.linux.amd64.kaniko1.9.1 b/docker/docker/Dockerfile.linux.amd64.kaniko1.9.2 similarity index 55% rename from docker/docker/Dockerfile.linux.amd64.kaniko1.9.1 rename to docker/docker/Dockerfile.linux.amd64.kaniko1.9.2 index a446f17..bdfa8df 100644 --- a/docker/docker/Dockerfile.linux.amd64.kaniko1.9.1 +++ b/docker/docker/Dockerfile.linux.amd64.kaniko1.9.2 @@ -1,5 +1,5 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/amd64/kaniko-docker /kaniko/ ENTRYPOINT ["/kaniko/kaniko-docker"] diff --git a/docker/docker/Dockerfile.linux.arm64 b/docker/docker/Dockerfile.linux.arm64 index 1ccf8b2..d71f30b 100644 --- a/docker/docker/Dockerfile.linux.arm64 +++ b/docker/docker/Dockerfile.linux.arm64 @@ -1,8 +1,8 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 ENV HOME /root ENV USER root -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/arm64/kaniko-docker /kaniko/ ENTRYPOINT ["/kaniko/kaniko-docker"] diff --git a/docker/docker/Dockerfile.linux.arm64.kaniko1.9.1 b/docker/docker/Dockerfile.linux.arm64.kaniko1.9.2 similarity index 55% rename from docker/docker/Dockerfile.linux.arm64.kaniko1.9.1 rename to docker/docker/Dockerfile.linux.arm64.kaniko1.9.2 index 5454049..e098f39 100644 --- a/docker/docker/Dockerfile.linux.arm64.kaniko1.9.1 +++ b/docker/docker/Dockerfile.linux.arm64.kaniko1.9.2 @@ -1,5 +1,5 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/arm64/kaniko-docker /kaniko/ ENTRYPOINT ["/kaniko/kaniko-docker"] diff --git a/docker/docker/manifest-kaniko1.9.1.tmpl b/docker/docker/manifest-kaniko1.9.2.tmpl similarity index 75% rename from docker/docker/manifest-kaniko1.9.1.tmpl rename to docker/docker/manifest-kaniko1.9.2.tmpl index 3eb17b8..0a1df8b 100644 --- a/docker/docker/manifest-kaniko1.9.1.tmpl +++ b/docker/docker/manifest-kaniko1.9.2.tmpl @@ -1,4 +1,4 @@ -image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-kaniko1.9.1{{else}}latest-kaniko1.9.1{{/if}} +image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-kaniko1.9.2{{else}}latest-kaniko1.9.2{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -7,12 +7,12 @@ tags: {{/if}} manifests: - - image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-kaniko1.9.1 + image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-kaniko1.9.2 platform: architecture: amd64 os: linux - - image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-kaniko1.9.1 + image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-kaniko1.9.2 platform: architecture: arm64 os: linux diff --git a/docker/ecr/Dockerfile.linux.amd64 b/docker/ecr/Dockerfile.linux.amd64 index 600ffa4..3f86139 100644 --- a/docker/ecr/Dockerfile.linux.amd64 +++ b/docker/ecr/Dockerfile.linux.amd64 @@ -1,5 +1,5 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/amd64/kaniko-ecr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-ecr"] diff --git a/docker/ecr/Dockerfile.linux.amd64.kaniko1.9.1 b/docker/ecr/Dockerfile.linux.amd64.kaniko1.9.2 similarity index 53% rename from docker/ecr/Dockerfile.linux.amd64.kaniko1.9.1 rename to docker/ecr/Dockerfile.linux.amd64.kaniko1.9.2 index 600ffa4..3f86139 100644 --- a/docker/ecr/Dockerfile.linux.amd64.kaniko1.9.1 +++ b/docker/ecr/Dockerfile.linux.amd64.kaniko1.9.2 @@ -1,5 +1,5 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/amd64/kaniko-ecr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-ecr"] diff --git a/docker/ecr/Dockerfile.linux.arm64 b/docker/ecr/Dockerfile.linux.arm64 index 3c77edd..c5e8d33 100644 --- a/docker/ecr/Dockerfile.linux.arm64 +++ b/docker/ecr/Dockerfile.linux.arm64 @@ -1,8 +1,8 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 ENV HOME /root ENV USER root -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/arm64/kaniko-ecr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-ecr"] diff --git a/docker/ecr/Dockerfile.linux.arm64.kaniko1.9.1 b/docker/ecr/Dockerfile.linux.arm64.kaniko1.9.2 similarity index 53% rename from docker/ecr/Dockerfile.linux.arm64.kaniko1.9.1 rename to docker/ecr/Dockerfile.linux.arm64.kaniko1.9.2 index 4616778..274d42e 100644 --- a/docker/ecr/Dockerfile.linux.arm64.kaniko1.9.1 +++ b/docker/ecr/Dockerfile.linux.arm64.kaniko1.9.2 @@ -1,5 +1,5 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/arm64/kaniko-ecr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-ecr"] diff --git a/docker/ecr/manifest-kaniko1.9.1.tmpl b/docker/ecr/manifest-kaniko1.9.2.tmpl similarity index 74% rename from docker/ecr/manifest-kaniko1.9.1.tmpl rename to docker/ecr/manifest-kaniko1.9.2.tmpl index 1207437..2c9f0da 100644 --- a/docker/ecr/manifest-kaniko1.9.1.tmpl +++ b/docker/ecr/manifest-kaniko1.9.2.tmpl @@ -1,4 +1,4 @@ -image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-kaniko1.9.1{{else}}latest-kaniko1.9.1{{/if}} +image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-kaniko1.9.2{{else}}latest-kaniko1.9.2{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -7,12 +7,12 @@ tags: {{/if}} manifests: - - image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-kaniko1.9.1 + image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-kaniko1.9.2 platform: architecture: amd64 os: linux - - image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-kaniko1.9.1 + image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-kaniko1.9.2 platform: architecture: arm64 os: linux diff --git a/docker/gcr/Dockerfile.linux.amd64 b/docker/gcr/Dockerfile.linux.amd64 index baa2775..4d26acc 100644 --- a/docker/gcr/Dockerfile.linux.amd64 +++ b/docker/gcr/Dockerfile.linux.amd64 @@ -1,5 +1,5 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/amd64/kaniko-gcr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-gcr"] diff --git a/docker/gcr/Dockerfile.linux.amd64.kaniko1.9.1 b/docker/gcr/Dockerfile.linux.amd64.kaniko1.9.2 similarity index 53% rename from docker/gcr/Dockerfile.linux.amd64.kaniko1.9.1 rename to docker/gcr/Dockerfile.linux.amd64.kaniko1.9.2 index baa2775..4d26acc 100644 --- a/docker/gcr/Dockerfile.linux.amd64.kaniko1.9.1 +++ b/docker/gcr/Dockerfile.linux.amd64.kaniko1.9.2 @@ -1,5 +1,5 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/amd64/kaniko-gcr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-gcr"] diff --git a/docker/gcr/Dockerfile.linux.arm64 b/docker/gcr/Dockerfile.linux.arm64 index c4196ab..1a859ce 100644 --- a/docker/gcr/Dockerfile.linux.arm64 +++ b/docker/gcr/Dockerfile.linux.arm64 @@ -1,8 +1,8 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 ENV HOME /root ENV USER root -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/arm64/kaniko-gcr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-gcr"] diff --git a/docker/gcr/Dockerfile.linux.arm64.kaniko1.9.1 b/docker/gcr/Dockerfile.linux.arm64.kaniko1.9.2 similarity index 53% rename from docker/gcr/Dockerfile.linux.arm64.kaniko1.9.1 rename to docker/gcr/Dockerfile.linux.arm64.kaniko1.9.2 index ff85a0d..1bb8771 100644 --- a/docker/gcr/Dockerfile.linux.arm64.kaniko1.9.1 +++ b/docker/gcr/Dockerfile.linux.arm64.kaniko1.9.2 @@ -1,5 +1,5 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1 +FROM gcr.io/kaniko-project/executor:v1.9.2 -ENV KANIKO_VERSION=1.9.1 +ENV KANIKO_VERSION=1.9.2 ADD release/linux/arm64/kaniko-gcr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-gcr"] diff --git a/docker/gcr/manifest-kaniko1.9.1.tmpl b/docker/gcr/manifest-kaniko1.9.2.tmpl similarity index 74% rename from docker/gcr/manifest-kaniko1.9.1.tmpl rename to docker/gcr/manifest-kaniko1.9.2.tmpl index b66dc37..984ef8a 100644 --- a/docker/gcr/manifest-kaniko1.9.1.tmpl +++ b/docker/gcr/manifest-kaniko1.9.2.tmpl @@ -1,4 +1,4 @@ -image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-kaniko1.9.1{{else}}latest-kaniko1.9.1{{/if}} +image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-kaniko1.9.2{{else}}latest-kaniko1.9.2{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -7,12 +7,12 @@ tags: {{/if}} manifests: - - image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-kaniko1.9.1 + image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-kaniko1.9.2 platform: architecture: amd64 os: linux - - image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-kaniko1.9.1 + image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-kaniko1.9.2 platform: architecture: arm64 os: linux \ No newline at end of file