Update nginx image to fix openssl CVE
This commit is contained in:
parent
5d67794f4f
commit
d4e0657991
5 changed files with 5 additions and 5 deletions
2
Makefile
2
Makefile
|
@ -62,7 +62,7 @@ endif
|
|||
REGISTRY ?= quay.io/kubernetes-ingress-controller
|
||||
|
||||
BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx
|
||||
BASE_TAG ?= 914aad2ae368dfd0dc56f664bda9da018b1eae92
|
||||
BASE_TAG ?= 5d67794f4fbf38ec6575476de46201b068eabf87
|
||||
|
||||
GOARCH=$(ARCH)
|
||||
GOBUILD_FLAGS := -v
|
||||
|
|
|
@ -34,7 +34,7 @@ function cleanup {
|
|||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04142020-0257068b9
|
||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04212020-5d67794f4
|
||||
|
||||
DOCKER_OPTS=${DOCKER_OPTS:-}
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ docker-build:
|
|||
--build-arg K8S_RELEASE=v1.17.0 \
|
||||
--build-arg ETCD_VERSION=v3.3.18 \
|
||||
--build-arg KIND_VERSION=v0.7.0 \
|
||||
--build-arg GOLANG_VERSION=1.14.2 \
|
||||
--build-arg GO_VERSION=1.14.2 \
|
||||
-t $(IMAGE):$(TAG) .
|
||||
|
||||
docker-push:
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:914aad2ae368dfd0dc56f664bda9da018b1eae92
|
||||
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:5d67794f4fbf38ec6575476de46201b068eabf87
|
||||
|
||||
ARG GOLANG_VERSION
|
||||
ARG GOLANG_SHA
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM quay.io/kubernetes-ingress-controller/e2e:v04172020-6e8c68d88 AS BASE
|
||||
FROM quay.io/kubernetes-ingress-controller/e2e:v04212020-5d67794f4 AS BASE
|
||||
|
||||
FROM alpine:3.11
|
||||
|
||||
|
|
Loading…
Reference in a new issue