mirror of
https://github.com/GoogleContainerTools/kaniko
synced 2026-09-30 13:34:00 +02:00
fix cloudbuild release
This commit is contained in:
+2
-2
@@ -14,7 +14,7 @@
|
||||
|
||||
# Builds the static Go image to execute in a Kubernetes job
|
||||
|
||||
FROM golang:1.14
|
||||
FROM golang:1.15
|
||||
ARG GOARCH=amd64
|
||||
WORKDIR /go/src/github.com/GoogleContainerTools/kaniko
|
||||
RUN echo $GOARCH > /goarch
|
||||
@@ -27,7 +27,7 @@ RUN [ ! "x" = "x$TARGETPLATFORM" ] && `echo $TARGETPLATFORM | awk '{split($0,a,
|
||||
RUN echo "I am runninng $TARGETPLATFORM with with $(cat /goarch)"
|
||||
|
||||
# Get GCR credential helper
|
||||
RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \
|
||||
RUN GOARCH=$(cat /goarch) && \
|
||||
(mkdir -p /go/src/github.com/GoogleCloudPlatform || true) && \
|
||||
cd /go/src/github.com/GoogleCloudPlatform && \
|
||||
git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
# Builds the static Go image to execute in a Kubernetes job
|
||||
|
||||
# Stage 0: Build the executor binary and get credential helpers
|
||||
FROM golang:1.14
|
||||
FROM golang:1.15
|
||||
ARG GOARCH=amd64
|
||||
RUN echo $GOARCH > /goarch
|
||||
|
||||
@@ -30,7 +30,7 @@ RUN cat /goarch
|
||||
WORKDIR /go/src/github.com/GoogleContainerTools/kaniko
|
||||
|
||||
# Get GCR credential helper
|
||||
RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \
|
||||
RUN GOARCH=$(cat /goarch) && \
|
||||
(mkdir -p /go/src/github.com/GoogleCloudPlatform || true) && \
|
||||
cd /go/src/github.com/GoogleCloudPlatform && \
|
||||
git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
# Builds the static Go image to execute in a Kubernetes job
|
||||
FROM golang:1.14 as build_env
|
||||
FROM golang:1.15 as build_env
|
||||
ARG GOARCH=amd64
|
||||
RUN echo $GOARCH > /goarch
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
# Builds the static Go image to execute in a Kubernetes job
|
||||
|
||||
FROM golang:1.14
|
||||
FROM golang:1.15
|
||||
ARG GOARCH=amd64
|
||||
WORKDIR /go/src/github.com/GoogleContainerTools/kaniko
|
||||
RUN echo $GOARCH > /goarch
|
||||
@@ -27,7 +27,7 @@ RUN [ ! "x" = "x$TARGETPLATFORM" ] && `echo $TARGETPLATFORM | awk '{split($0,a,
|
||||
RUN echo "I am runninng $TARGETPLATFORM with $(cat /goarch)"
|
||||
|
||||
# Get GCR credential helper
|
||||
RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \
|
||||
RUN GOARCH=$(cat /goarch) && \
|
||||
(mkdir -p /go/src/github.com/GoogleCloudPlatform || true) && \
|
||||
cd /go/src/github.com/GoogleCloudPlatform && \
|
||||
git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \
|
||||
|
||||
@@ -9,10 +9,10 @@ steps:
|
||||
args: ['buildx', 'create', '--use', '--platform', '${_DOCKER_BUILDX_PLATFORMS}']
|
||||
id: 'create-builder'
|
||||
|
||||
# # First, build kaniko
|
||||
# - name: "gcr.io/cloud-builders/docker"
|
||||
# args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile",
|
||||
# "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:$COMMIT_SHA", "--push", "." ]
|
||||
# First, build kaniko
|
||||
- name: "gcr.io/cloud-builders/docker"
|
||||
args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile",
|
||||
"-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:$COMMIT_SHA", "--push", "." ]
|
||||
|
||||
# Finally executor:slim image
|
||||
- name: "gcr.io/cloud-builders/docker"
|
||||
|
||||
Reference in New Issue
Block a user