DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3406 from aledbf/update-image

Browse source 
Update nginx and e2e image
This commit is contained in:
k8s-ci-robot 2018-11-12 08:10:36 -08:00 committed by GitHub
commit 97b9bf9558
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -61,7 +61,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.67 BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.69
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
QEMUARCH=arm QEMUARCH=arm

2
build/go-in-docker.sh
View file

@ -40,7 +40,7 @@ if [ "$missing" = true ];then
exit 1 exit 1
fi fi
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v11032018-1978bed E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v11122018-14fe4898a
DOCKER_OPTS=${DOCKER_OPTS:-""} DOCKER_OPTS=${DOCKER_OPTS:-""}

6
images/e2e/Dockerfile
View file

@ -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.66 FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.69
RUN clean-install \ RUN clean-install \
g++ \ g++ \
@ -25,9 +25,9 @@ RUN clean-install \
python \ python \
pkg-config pkg-config
ENV GOLANG_VERSION 1.11 ENV GOLANG_VERSION 1.11.2
ENV GO_ARCH linux-amd64 ENV GO_ARCH linux-amd64
ENV GOLANG_SHA b3fcf280ff86558e0559e185b601c9eade0fd24c900b4c63cd14d1d38613e499 ENV GOLANG_SHA 1dfe664fa3d8ad714bbd15a36627992effd150ddabd7523931f077b3926d736d
RUN set -eux; \ RUN set -eux; \
url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \ url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \