update cloud build (kubernetes#8349)

anaclaudiar · Mar 17, 2022 · 40bb6c3 · 40bb6c3
1 parent 9602fc1
commit 40bb6c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml
@@ -4,21 +4,18 @@ options:
   # job builds a multi-arch docker image for amd64,arm,arm64 and s390x.
   machineType: N1_HIGHCPU_32
 steps:
-  - name: gcr.io/k8s-staging-test-infra/image-builder:v20220309-4b32800b2d
+  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90'
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - COMMIT=$SHORT_SHA
       - BASE_REF=$_PULL_BASE_REF
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
-      # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
-      # set the home to /root explicitly to if using docker buildx
-      - HOME=/root
+       - HOME=/root
     args:
     - -c
     - |
       gcloud auth configure-docker \
-      && TAG=v$(date "+%Y%m%d")-${COMMIT} make push
+      && TAG=v$(date "+%Y%m%d")-$(git rev-parse --short HEAD) make push
 substitutions:
   _GIT_TAG: "12345"
   _PULL_BASE_REF: "master"
diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile
@@ -41,7 +41,8 @@ RUN apk update \
     pcre \
     zlib \
     geoip \
-    curl ca-certificates \
+    curl \
+    ca-certificates \
     patch \
     yajl \
     lmdb \
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,8 @@ RUN apk update \ @@
         pcre \
         zlib \
         geoip \
-        curl ca-certificates \
+        curl \
+        ca-certificates \
         patch \
         yajl \
         lmdb \
@@ Expand Down @@