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

Update nginx image and Go to 1.12.4 (#4010)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-04-17 22:45:51 -04:00 committed by GitHub
parent 0953b3d22e
commit 7283a01b9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -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.84 BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.85
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
QEMUARCH=aarch64 QEMUARCH=aarch64

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:v04062019-3dc4253b7 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04172019-3fa3923cb
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.84 FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.85
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.12.1 ENV GOLANG_VERSION 1.12.4
ENV GO_ARCH linux-amd64 ENV GO_ARCH linux-amd64
ENV GOLANG_SHA 2a3fdabf665496a0db5f41ec6af7a9b15a49fbe71a85a50ca38b1f13a103aeec ENV GOLANG_SHA d7d1f1f88ddfe55840712dc1747f37a790cbcaa448f6c9cf51bbe10aa65442f5
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"; \

2
test/e2e-image/Dockerfile
View file

@ -1,4 +1,4 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v04062019-3dc4253b7 AS BASE FROM quay.io/kubernetes-ingress-controller/e2e:v04172019-3fa3923cb AS BASE
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1 FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1