Merge pull request #3934 from aledbf/update-nginx-image
Update nginx image
This commit is contained in:
commit
83751bad2b
3 changed files with 5 additions and 5 deletions
|
@ -40,7 +40,7 @@ if [ "$missing" = true ];then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03192019-080bed8e8
|
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03262019-b033fbf0b
|
||||||
|
|
||||||
DOCKER_OPTS=${DOCKER_OPTS:-""}
|
DOCKER_OPTS=${DOCKER_OPTS:-""}
|
||||||
|
|
||||||
|
|
|
@ -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.82
|
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.83
|
||||||
|
|
||||||
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
|
ENV GOLANG_VERSION 1.12.1
|
||||||
ENV GO_ARCH linux-amd64
|
ENV GO_ARCH linux-amd64
|
||||||
ENV GOLANG_SHA 750a07fef8579ae4839458701f4df690e0b20b8bcce33b437e4df89c451b6f13
|
ENV GOLANG_SHA 2a3fdabf665496a0db5f41ec6af7a9b15a49fbe71a85a50ca38b1f13a103aeec
|
||||||
|
|
||||||
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"; \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM quay.io/kubernetes-ingress-controller/e2e:v03192019-080bed8e8 AS BASE
|
FROM quay.io/kubernetes-ingress-controller/e2e:v03262019-b033fbf0b AS BASE
|
||||||
|
|
||||||
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
|
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue