Merge pull request #2956 from aledbf/update-nginx-image
Update nginx and e2e images
This commit is contained in:
commit
b78bb2524e
3 changed files with 4 additions and 3 deletions
2
Makefile
2
Makefile
|
@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
|
|||
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
|
||||
|
||||
# Set default base image dynamically for each arch
|
||||
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.58
|
||||
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.59
|
||||
|
||||
ifeq ($(ARCH),arm)
|
||||
QEMUARCH=arm
|
||||
|
|
|
@ -40,7 +40,7 @@ if [ "$missing" = true ];then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08152018-56ed290
|
||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08172018-4c33df1
|
||||
|
||||
DOCKER_OPTS=${DOCKER_OPTS:-""}
|
||||
|
||||
|
|
|
@ -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:0.57
|
||||
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.59
|
||||
|
||||
RUN clean-install \
|
||||
g++ \
|
||||
|
@ -22,6 +22,7 @@ RUN clean-install \
|
|||
make \
|
||||
wget \
|
||||
luarocks \
|
||||
python \
|
||||
pkg-config
|
||||
|
||||
ENV GOLANG_VERSION 1.10.3
|
||||
|
|
Loading…
Reference in a new issue