Fix manifest of ACR (#62 )

Add arm stage as a depends_on for manifest stages (#61 )
Fix acr manifest template (#60 )
2026-06-16 14:49:02 +08:00 · 2022-08-18 11:52:19 +05:30 · 2022-08-17 11:54:11 +05:30 · 2022-08-17 11:24:31 +05:30 · 2022-08-16 11:20:49 +05:30
15 changed files with 193 additions and 6 deletions
@@ -131,6 +131,141 @@ steps:
 ---
 kind: pipeline
 type: docker
+name: arm
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: golang:1.18
+  commands:
+  - go test ./...
+  - sh scripts/build.sh
+
+- name: docker
+  image: plugins/docker
+  settings:
+    repo: plugins/kaniko
+    auto_tag: true
+    auto_tag_suffix: linux-arm64
+    daemon_off: false
+    dockerfile: docker/docker/Dockerfile.linux.arm64
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+  when:
+    event:
+      exclude:
+      - pull_request
+
+- name: gcr
+  image: plugins/docker
+  settings:
+    repo: plugins/kaniko-gcr
+    auto_tag: true
+    auto_tag_suffix: linux-arm64
+    daemon_off: false
+    dockerfile: docker/gcr/Dockerfile.linux.arm64
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+  when:
+    event:
+      exclude:
+      - pull_request
+
+- name: ecr
+  image: plugins/docker
+  settings:
+    repo: plugins/kaniko-ecr
+    auto_tag: true
+    auto_tag_suffix: linux-arm64
+    daemon_off: false
+    dockerfile: docker/ecr/Dockerfile.linux.arm64
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+  when:
+    event:
+      exclude:
+      - pull_request
+
+- name: acr
+  image: plugins/docker
+  settings:
+    repo: plugins/kaniko-acr
+    auto_tag: true
+    auto_tag_suffix: linux-arm64
+    daemon_off: false
+    dockerfile: docker/acr/Dockerfile.linux.arm64
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+  when:
+    event:
+      exclude:
+      - pull_request
+
+- name: docker-kaniko-v1-8
+  image: plugins/docker
+  settings:
+    repo: plugins/kaniko
+    auto_tag: true
+    auto_tag_suffix: linux-arm64-kaniko1.8.1
+    daemon_off: false
+    dockerfile: docker/docker/Dockerfile.linux.arm64.kaniko1.8.1
+    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-arm64-kaniko1.8.1
+    daemon_off: false
+    dockerfile: docker/gcr/Dockerfile.linux.arm64.kaniko1.8.1
+    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-arm64-kaniko1.8.1
+    daemon_off: false
+    dockerfile: docker/ecr/Dockerfile.linux.arm64.kaniko1.8.1
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+  when:
+    event:
+      exclude:
+      - pull_request
+---
+kind: pipeline
+type: docker
 name: notifications-docker

 platform:
@@ -193,6 +328,7 @@ trigger:

 depends_on:
 - default
+- arm

 ---
 kind: pipeline
@@ -247,3 +383,4 @@ trigger:

 depends_on:
 - default
+- arm
@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:arm64-v1.8.1
+FROM gcr.io/kaniko-project/executor:v1.8.1

 ENV HOME /root
 ENV USER root
@@ -1,4 +1,4 @@
-image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+image: plugins/kaniko-acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
@@ -7,7 +7,12 @@ tags:
 {{/if}}
 manifests:
  -
-    image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    image: plugins/kaniko-acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
    platform:
      architecture: amd64
      os: linux
+  -
+    image: plugins/kaniko-acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+    platform:
+      architecture: arm64
+      os: linux
@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:arm64-v1.6.0
+FROM gcr.io/kaniko-project/executor:v1.6.0

 ENV HOME /root
 ENV USER root
@@ -0,0 +1,5 @@
+FROM gcr.io/kaniko-project/executor:v1.8.1
+
+ENV KANIKO_VERSION=1.8.1
+ADD release/linux/arm64/kaniko-docker /kaniko/
+ENTRYPOINT ["/kaniko/kaniko-docker"]
@@ -11,3 +11,8 @@ manifests:
    platform:
      architecture: amd64
      os: linux
+  -
+    image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-kaniko1.8.1
+    platform:
+      architecture: arm64
+      os: linux
@@ -11,3 +11,8 @@ manifests:
    platform:
      architecture: amd64
      os: linux
+  -
+    image: plugins/kaniko:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+    platform:
+      architecture: arm64
+      os: linux
@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:arm64-v1.6.0
+FROM gcr.io/kaniko-project/executor:v1.6.0

 ENV HOME /root
 ENV USER root
@@ -0,0 +1,5 @@
+FROM gcr.io/kaniko-project/executor:v1.8.1
+
+ENV KANIKO_VERSION=1.8.1
+ADD release/linux/arm64/kaniko-ecr /kaniko/
+ENTRYPOINT ["/kaniko/kaniko-ecr"]
@@ -11,3 +11,8 @@ manifests:
    platform:
      architecture: amd64
      os: linux
+  -
+    image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-kaniko1.8.1
+    platform:
+      architecture: arm64
+      os: linux
@@ -10,4 +10,9 @@ manifests:
    image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
    platform:
      architecture: amd64
+      os: linux
+  -
+    image: plugins/kaniko-ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+    platform:
+      architecture: arm64
      os: linux
@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:arm64-v1.6.0
+FROM gcr.io/kaniko-project/executor:v1.6.0

 ENV HOME /root
 ENV USER root
@@ -0,0 +1,5 @@
+FROM gcr.io/kaniko-project/executor:v1.8.1
+
+ENV KANIKO_VERSION=1.8.1
+ADD release/linux/arm64/kaniko-gcr /kaniko/
+ENTRYPOINT ["/kaniko/kaniko-gcr"]
@@ -11,3 +11,8 @@ manifests:
    platform:
      architecture: amd64
      os: linux
+  -
+    image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-kaniko1.8.1
+    platform:
+      architecture: arm64
+      os: linux
@@ -11,3 +11,8 @@ manifests:
    platform:
      architecture: amd64
      os: linux
+  -
+    image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+    platform:
+      architecture: arm64
+      os: linux
Author	SHA1	Message	Date
Jamie Li	864a7e5319	Fix manifest of ACR (#62 )	2022-08-18 11:52:19 +05:30
Jamie Li	1c34458f6c	Add arm stage as a depends_on for manifest stages (#61 )	2022-08-17 11:54:11 +05:30
Jamie Li	725950ee02	Fix acr manifest template (#60 )	2022-08-17 11:24:31 +05:30
Jamie Li	97a3f33180	Add arm image build (#59 )	2022-08-16 11:20:49 +05:30