Update test image and binaries
This commit is contained in:
parent
991f95f6bf
commit
73be06960e
6 changed files with 9 additions and 10 deletions
|
@ -22,7 +22,7 @@ set -o errexit
|
|||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v06042019-0c7a34696
|
||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v06232019-5bb168152
|
||||
|
||||
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.87
|
||||
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.88
|
||||
|
||||
RUN clean-install \
|
||||
g++ \
|
||||
|
@ -21,13 +21,12 @@ RUN clean-install \
|
|||
libc6-dev \
|
||||
make \
|
||||
wget \
|
||||
luarocks \
|
||||
python \
|
||||
pkg-config
|
||||
|
||||
ENV GOLANG_VERSION 1.12.5
|
||||
ENV GOLANG_VERSION 1.12.6
|
||||
ENV GO_ARCH linux-amd64
|
||||
ENV GOLANG_SHA aea86e3c73495f205929cfebba0d63f1382c8ac59be081b6351681415f4063cf
|
||||
ENV GOLANG_SHA dbcf71a3c1ea53b8d54ef1b48c85a39a6c9a935d01fc8291ff2b92028e59913c
|
||||
|
||||
RUN set -eux; \
|
||||
url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \
|
||||
|
|
|
@ -23,7 +23,7 @@ all: docker-build docker-push
|
|||
docker-build:
|
||||
$(DOCKER) build \
|
||||
--pull \
|
||||
--build-arg K8S_RELEASE=v1.14.1 \
|
||||
--build-arg K8S_RELEASE=v1.15.0 \
|
||||
--build-arg ETCD_VERSION=v3.3.12 \
|
||||
-t $(IMAGE):$(TAG) .
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM quay.io/kubernetes-ingress-controller/e2e:v06042019-0c7a34696 AS BASE
|
||||
FROM quay.io/kubernetes-ingress-controller/e2e:v06232019-5bb168152 AS BASE
|
||||
|
||||
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
|
||||
|
||||
|
@ -9,7 +9,7 @@ RUN clean-install \
|
|||
tzdata
|
||||
|
||||
RUN curl -Lo /usr/local/bin/kubectl \
|
||||
https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl \
|
||||
https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/amd64/kubectl \
|
||||
&& chmod +x /usr/local/bin/kubectl
|
||||
|
||||
COPY --from=BASE /go/bin/ginkgo /usr/local/bin/
|
||||
|
|
|
@ -56,7 +56,7 @@ RUN curl -L https://storage.googleapis.com/etcd/${ETCD_VERSION}/etcd-${ETCD_VERS
|
|||
&& rm -rf /tmp/etcd-download
|
||||
|
||||
# install go
|
||||
ENV GO_VERSION 1.12.5
|
||||
ENV GO_VERSION 1.12.6
|
||||
ENV GO_TARBALL "go${GO_VERSION}.linux-amd64.tar.gz"
|
||||
RUN wget -q "https://storage.googleapis.com/golang/${GO_TARBALL}" && \
|
||||
tar xzf "${GO_TARBALL}" -C /usr/local && \
|
||||
|
|
|
@ -9,7 +9,7 @@ all: docker-build docker-push
|
|||
docker-build:
|
||||
$(DOCKER) build \
|
||||
--pull \
|
||||
--build-arg K8S_RELEASE=v1.14.1 \
|
||||
--build-arg K8S_RELEASE=v1.15.0 \
|
||||
--build-arg ETCD_VERSION=v3.3.12 \
|
||||
-t $(IMAGE):$(TAG) .
|
||||
|
||||
|
|
Loading…
Reference in a new issue