Update nginx image to 0.84 (#3969)
This commit is contained in:
parent
8960226f40
commit
c9d069e64d
4 changed files with 4 additions and 4 deletions
2
Makefile
2
Makefile
|
@ -60,7 +60,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
|
||||||
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
|
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
|
||||||
|
|
||||||
# Set default base image dynamically for each arch
|
# Set default base image dynamically for each arch
|
||||||
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.82
|
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.84
|
||||||
|
|
||||||
ifeq ($(ARCH),arm64)
|
ifeq ($(ARCH),arm64)
|
||||||
QEMUARCH=aarch64
|
QEMUARCH=aarch64
|
||||||
|
|
|
@ -40,7 +40,7 @@ if [ "$missing" = true ];then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03262019-b033fbf0b
|
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04062019-3dc4253b7
|
||||||
|
|
||||||
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:0.83
|
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.84
|
||||||
|
|
||||||
RUN clean-install \
|
RUN clean-install \
|
||||||
g++ \
|
g++ \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM quay.io/kubernetes-ingress-controller/e2e:v03262019-b033fbf0b AS BASE
|
FROM quay.io/kubernetes-ingress-controller/e2e:v04062019-3dc4253b7 AS BASE
|
||||||
|
|
||||||
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
|
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue