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

Merge pull request #4233 from aledbf/update-nginx

Browse source 
Update nginx image to 0.90
This commit is contained in:
Kubernetes Prow Robot 2019-06-26 20:13:21 -07:00 committed by GitHub
commit c8967a98fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 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

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

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

@ -22,7 +22,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v06242019-1f28975c2 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v06262019-ecce3fd7b
DOCKER_OPTS=${DOCKER_OPTS:-""} DOCKER_OPTS=${DOCKER_OPTS:-""}

2
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.89 FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.90
RUN clean-install \ RUN clean-install \
g++ \ g++ \

2
images/nginx/README.md
View file

@ -20,7 +20,7 @@ This image provides a default configuration file with no backend servers.
_Using docker_ _Using docker_
```console ```console
docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro quay.io/kubernetes-ingress-controller/nginx:0.89 docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro quay.io/kubernetes-ingress-controller/nginx:0.90
``` ```
_Creating a replication controller_ _Creating a replication controller_

2
images/nginx/rc.yaml
View file

@ -38,7 +38,7 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: quay.io/kubernetes-ingress-controller/nginx:0.89 image: quay.io/kubernetes-ingress-controller/nginx:0.90
ports: ports:
- containerPort: 80 - containerPort: 80
- containerPort: 443 - containerPort: 443

2
test/e2e-image/Dockerfile
View file

@ -1,4 +1,4 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v06242019-1f28975c2 AS BASE FROM quay.io/kubernetes-ingress-controller/e2e:v06262019-ecce3fd7b AS BASE
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1 FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1