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

Update nginx and e2e images

Browse source
This commit is contained in:
Manuel de Brito Fontes 2018-08-17 17:35:17 -03:00
parent b4942ccd03
commit 285210ecd9
3 changed files with 4 additions and 3 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.58 BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.59
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:v08152018-56ed290 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08172018-4c33df1
DOCKER_OPTS=${DOCKER_OPTS:-""} DOCKER_OPTS=${DOCKER_OPTS:-""}

3
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.57 FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.59
RUN clean-install \ RUN clean-install \
g++ \ g++ \
@ -22,6 +22,7 @@ RUN clean-install \
make \ make \
wget \ wget \
luarocks \ luarocks \
python \
pkg-config pkg-config
ENV GOLANG_VERSION 1.10.3 ENV GOLANG_VERSION 1.10.3