updating nginx base image across repo
This commit is contained in:
parent
844a02c276
commit
a865241e7d
5 changed files with 5 additions and 5 deletions
|
@ -36,7 +36,7 @@ build: ensure-buildx
|
||||||
--platform=${PLATFORMS} $(OUTPUT) \
|
--platform=${PLATFORMS} $(OUTPUT) \
|
||||||
--progress=$(PROGRESS) \
|
--progress=$(PROGRESS) \
|
||||||
--pull \
|
--pull \
|
||||||
--build-arg BASE_IMAGE=k8s.gcr.io/ingress-nginx/nginx:v20210104-g2254a9186@sha256:edd1d06bc6892b0dfb42de7d782ceb3c50eec843b09024abf3f95ba23f4feed5 \
|
--build-arg BASE_IMAGE=k8s.gcr.io/ingress-nginx/nginx:v20210324-g8baef769d@sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6 \
|
||||||
--build-arg LUAROCKS_VERSION=3.3.1 \
|
--build-arg LUAROCKS_VERSION=3.3.1 \
|
||||||
--build-arg LUAROCKS_SHA=837481e408f7c06b59befe7ec194537c657687d624894bca7f79034302141a34 \
|
--build-arg LUAROCKS_SHA=837481e408f7c06b59befe7ec194537c657687d624894bca7f79034302141a34 \
|
||||||
-t $(IMAGE):$(TAG) rootfs
|
-t $(IMAGE):$(TAG) rootfs
|
||||||
|
|
|
@ -18,7 +18,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 k8s.gcr.io/ingress-nginx/nginx:v20210104-g2254a9186@sha256:edd1d06bc6892b0dfb42de7d782ceb3c50eec843b09024abf3f95ba23f4feed5
|
docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro k8s.gcr.io/ingress-nginx/nginx:v20210324-g8baef769d@sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6
|
||||||
```
|
```
|
||||||
|
|
||||||
_Creating a replication controller_
|
_Creating a replication controller_
|
||||||
|
|
|
@ -38,7 +38,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: k8s.gcr.io/ingress-nginx/nginx:v20210104-g2254a9186@sha256:edd1d06bc6892b0dfb42de7d782ceb3c50eec843b09024abf3f95ba23f4feed5
|
image: k8s.gcr.io/ingress-nginx/nginx:v20210324-g8baef769d@sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
- containerPort: 443
|
- containerPort: 443
|
||||||
|
|
|
@ -36,7 +36,7 @@ build: ensure-buildx
|
||||||
--platform=${PLATFORMS} $(OUTPUT) \
|
--platform=${PLATFORMS} $(OUTPUT) \
|
||||||
--progress=$(PROGRESS) \
|
--progress=$(PROGRESS) \
|
||||||
--pull \
|
--pull \
|
||||||
--build-arg BASE_IMAGE=k8s.gcr.io/ingress-nginx/nginx:v20210104-g2254a9186@sha256:edd1d06bc6892b0dfb42de7d782ceb3c50eec843b09024abf3f95ba23f4feed5 \
|
--build-arg BASE_IMAGE=k8s.gcr.io/ingress-nginx/nginx:v20210324-g8baef769d@sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6 \
|
||||||
--build-arg GOLANG_VERSION=1.15.6 \
|
--build-arg GOLANG_VERSION=1.15.6 \
|
||||||
--build-arg ETCD_VERSION=3.4.3-0 \
|
--build-arg ETCD_VERSION=3.4.3-0 \
|
||||||
--build-arg K8S_RELEASE=v1.19.4 \
|
--build-arg K8S_RELEASE=v1.19.4 \
|
||||||
|
|
|
@ -139,7 +139,7 @@ func (f *Framework) NGINXWithConfigDeployment(name string, cfg string) {
|
||||||
}, metav1.CreateOptions{})
|
}, metav1.CreateOptions{})
|
||||||
assert.Nil(ginkgo.GinkgoT(), err, "creating configmap")
|
assert.Nil(ginkgo.GinkgoT(), err, "creating configmap")
|
||||||
|
|
||||||
deployment := newDeployment(name, f.Namespace, "k8s.gcr.io/ingress-nginx/nginx:v20210104-g2254a9186@sha256:edd1d06bc6892b0dfb42de7d782ceb3c50eec843b09024abf3f95ba23f4feed5", 80, 1,
|
deployment := newDeployment(name, f.Namespace, "k8s.gcr.io/ingress-nginx/nginx:v20210324-g8baef769d@sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6", 80, 1,
|
||||||
nil,
|
nil,
|
||||||
[]corev1.VolumeMount{
|
[]corev1.VolumeMount{
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue