Update NGINX image (#5221)
This commit is contained in:
parent
7b6e2dd312
commit
1374c1e242
4 changed files with 4 additions and 4 deletions
2
Makefile
2
Makefile
|
@ -64,7 +64,7 @@ ARCH ?= $(shell go env GOARCH)
|
||||||
REGISTRY ?= quay.io/kubernetes-ingress-controller
|
REGISTRY ?= quay.io/kubernetes-ingress-controller
|
||||||
|
|
||||||
BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx
|
BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx
|
||||||
BASE_TAG ?= c5db20ace43ada5b4c191df24c480fddceb5d482
|
BASE_TAG ?= 7b6e2dd312f1808e43fb39992ea814035557c7f3
|
||||||
|
|
||||||
GOARCH=$(ARCH)
|
GOARCH=$(ARCH)
|
||||||
GOBUILD_FLAGS := -v
|
GOBUILD_FLAGS := -v
|
||||||
|
|
|
@ -34,7 +34,7 @@ function cleanup {
|
||||||
}
|
}
|
||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
|
|
||||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v02262020-a830e931d
|
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03062020-7b6e2dd31
|
||||||
|
|
||||||
DOCKER_OPTS=${DOCKER_OPTS:-}
|
DOCKER_OPTS=${DOCKER_OPTS:-}
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:c5db20ace43ada5b4c191df24c480fddceb5d482
|
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:7b6e2dd312f1808e43fb39992ea814035557c7f3
|
||||||
|
|
||||||
ARG GOLANG_VERSION
|
ARG GOLANG_VERSION
|
||||||
ARG GOLANG_SHA
|
ARG GOLANG_SHA
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM quay.io/kubernetes-ingress-controller/e2e:v02262020-a830e931d AS BASE
|
FROM quay.io/kubernetes-ingress-controller/e2e:v03062020-7b6e2dd31 AS BASE
|
||||||
|
|
||||||
FROM alpine:3.11
|
FROM alpine:3.11
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue