Update nginx image (#4848)
This commit is contained in:
parent
870be3bcd8
commit
0ae5892935
4 changed files with 4 additions and 4 deletions
2
Makefile
2
Makefile
|
@ -77,7 +77,7 @@ export E2E_CHECK_LEAKS
|
||||||
export SLOW_E2E_THRESHOLD
|
export SLOW_E2E_THRESHOLD
|
||||||
|
|
||||||
# Set default base image dynamically for each arch
|
# Set default base image dynamically for each arch
|
||||||
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):97c59728dc26300675fbd3c8836046faced05044
|
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):870be3bcd88c267f14fd82da82303472f383cd14
|
||||||
|
|
||||||
ifeq ($(ARCH),arm)
|
ifeq ($(ARCH),arm)
|
||||||
QEMUARCH=arm
|
QEMUARCH=arm
|
||||||
|
|
|
@ -30,7 +30,7 @@ function cleanup {
|
||||||
}
|
}
|
||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
|
|
||||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v12022019-e864fc719
|
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v12182019-870be3bcd
|
||||||
|
|
||||||
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:97c59728dc26300675fbd3c8836046faced05044
|
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:870be3bcd88c267f14fd82da82303472f383cd14
|
||||||
|
|
||||||
RUN clean-install \
|
RUN clean-install \
|
||||||
g++ \
|
g++ \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM quay.io/kubernetes-ingress-controller/e2e:v12022019-e864fc719 AS BASE
|
FROM quay.io/kubernetes-ingress-controller/e2e:v12182019-870be3bcd 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