Merge pull request #4233 from aledbf/update-nginx
Update nginx image to 0.90
This commit is contained in:
commit
c8967a98fa
6 changed files with 6 additions and 6 deletions
2
Makefile
2
Makefile
|
@ -70,7 +70,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.89
|
||||
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.90
|
||||
|
||||
ifeq ($(ARCH),arm64)
|
||||
QEMUARCH=aarch64
|
||||
|
|
|
@ -22,7 +22,7 @@ set -o errexit
|
|||
set -o nounset
|
||||
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:-""}
|
||||
|
||||
|
|
|
@ -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.89
|
||||
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.90
|
||||
|
||||
RUN clean-install \
|
||||
g++ \
|
||||
|
|
|
@ -20,7 +20,7 @@ This image provides a default configuration file with no backend servers.
|
|||
_Using docker_
|
||||
|
||||
```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_
|
||||
|
|
|
@ -38,7 +38,7 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: nginx
|
||||
image: quay.io/kubernetes-ingress-controller/nginx:0.89
|
||||
image: quay.io/kubernetes-ingress-controller/nginx:0.90
|
||||
ports:
|
||||
- containerPort: 80
|
||||
- containerPort: 443
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue