DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update cloud build (#8349)

Browse source
This commit is contained in:
James Strong 2022-03-17 15:02:41 -04:00 committed by GitHub
parent 9602fc193d
commit 40bb6c3d2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
images/nginx/cloudbuild.yaml
View file

@ -4,21 +4,18 @@ options:
# job builds a multi-arch docker image for amd64,arm,arm64 and s390x. # job builds a multi-arch docker image for amd64,arm,arm64 and s390x.
machineType: N1_HIGHCPU_32 machineType: N1_HIGHCPU_32
steps: 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 entrypoint: bash
env: env:
- DOCKER_CLI_EXPERIMENTAL=enabled - DOCKER_CLI_EXPERIMENTAL=enabled
- COMMIT=$SHORT_SHA
- BASE_REF=$_PULL_BASE_REF - BASE_REF=$_PULL_BASE_REF
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - 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: args:
- -c - -c
- | - |
gcloud auth configure-docker \ 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: substitutions:
_GIT_TAG: "12345" _GIT_TAG: "12345"
_PULL_BASE_REF: "master" _PULL_BASE_REF: "master"

3
images/nginx/rootfs/Dockerfile
View file

@ -41,7 +41,8 @@ RUN apk update \
pcre \ pcre \
zlib \ zlib \
geoip \ geoip \
curl ca-certificates \ curl \
ca-certificates \
patch \ patch \
yajl \ yajl \
lmdb \ lmdb \