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

Merge pull request #10232 from strongjz/fix-images-tags

Browse source 
Fix images tags
This commit is contained in:
James Strong 2023-07-20 21:10:19 -04:00 committed by GitHub
commit 40f94ef1b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 4 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
images/cfssl/Makefile
View file

@ -23,8 +23,6 @@ TAG ?=v$(shell date +%Y%m%d)-$(SHORT_SHA)
REGISTRY ?= local
IMAGE = $(REGISTRY)/e2e-test-cfssl
# required to enable buildx

5
images/cfssl/cloudbuild.yaml
View file

@ -6,8 +6,6 @@ steps:
entrypoint: bash
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- SHORT_SHA=$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
@ -17,6 +15,3 @@ steps:
- |
gcloud auth configure-docker \
&& cd images/cfssl && make push
substitutions:
_GIT_TAG: "12345"
_PULL_BASE_REF: "master"

5
images/custom-error-pages/cloudbuild.yaml
View file

@ -6,8 +6,6 @@ steps:
entrypoint: bash
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- SHORT_SHA=$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
@ -17,6 +15,3 @@ steps:
- |
gcloud auth configure-docker \
&& cd images/custom-error-pages && make push
substitutions:
_GIT_TAG: "12345"
_PULL_BASE_REF: "master"

5
images/echo/cloudbuild.yaml
View file

@ -6,8 +6,6 @@ steps:
entrypoint: bash
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- SHORT_SHA=$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
@ -17,6 +15,3 @@ steps:
- |
gcloud auth configure-docker \
&& cd images/echo && make push
substitutions:
_GIT_TAG: "12345"
_PULL_BASE_REF: "master"

4
images/ext-auth-example-authsvc/Makefile
View file

@ -18,7 +18,9 @@ SHELL=/bin/bash -o pipefail -o errexit
DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
INIT_BUILDX=$(DIR)/../../hack/init-buildx.sh
TAG ?=v1.0.0
SHORT_SHA ?=$(shell git rev-parse --short HEAD)
TAG ?=v$(shell date +%Y%m%d)-$(SHORT_SHA)
REGISTRY ?= local
IMAGE = $(REGISTRY)/ext-auth-example-authsvc

5
images/ext-auth-example-authsvc/cloudbuild.yaml
View file

@ -8,8 +8,6 @@ steps:
entrypoint: bash
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- SHORT_SHA=$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
@ -19,6 +17,3 @@ steps:
- |
gcloud auth configure-docker \
&& cd images/ext-auth-example-authsvc && make push
substitutions:
_GIT_TAG: "12345"
_PULL_BASE_REF: "master"

6
images/fastcgi-helloserver/cloudbuild.yaml
View file

@ -6,8 +6,6 @@ steps:
entrypoint: bash
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- SHORT_SHA=$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
@ -17,6 +15,4 @@ steps:
- |
gcloud auth configure-docker \
&& cd images/fastcgi-helloserver && make push
substitutions:
_GIT_TAG: "12345"
_PULL_BASE_REF: "master"

5
images/go-grpc-greeter-server/cloudbuild.yaml
View file

@ -8,8 +8,6 @@ steps:
entrypoint: bash
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- SHORT_SHA=$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
@ -19,6 +17,3 @@ steps:
- |
gcloud auth configure-docker \
&& cd images/go-grpc-greeter-server && make push
substitutions:
_GIT_TAG: "12345"
_PULL_BASE_REF: "master"

5
images/httpbun/cloudbuild.yaml
View file

@ -8,8 +8,6 @@ steps:
entrypoint: bash
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- SHORT_SHA=$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
@ -19,6 +17,3 @@ steps:
- |
gcloud auth configure-docker \
&& cd images/httpbun && make push
substitutions:
_GIT_TAG: "12345"
_PULL_BASE_REF: "master"

5
images/kube-webhook-certgen/cloudbuild.yaml
View file

@ -21,8 +21,6 @@ steps:
entrypoint: bash
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- SHORT_SHA=$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
@ -32,6 +30,3 @@ steps:
- |
gcloud auth configure-docker \
&& cd images/kube-webhook-certgen && make push
substitutions:
_GIT_TAG: "12345"
_PULL_BASE_REF: "main"

5
images/opentelemetry/cloudbuild.yaml
View file

@ -8,8 +8,6 @@ steps:
entrypoint: bash
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
- SHORT_SHA=$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
@ -19,6 +17,3 @@ steps:
- |
gcloud auth configure-docker \
&& cd images/opentelemetry && make push
substitutions:
_GIT_TAG: "12345"
_PULL_BASE_REF: "main"