diff --git a/.travis.yml b/.travis.yml index fe24c846..ec39e0e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ language: go go_import_path: github.com/kubeflow/mpi-operator go: -- 1.10.2 +- 1.11.4 before_install: -- go get -u github.com/golang/dep/cmd/dep +- DEP_RELEASE_TAG=v0.5.0 curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh - dep ensure install: diff --git a/Dockerfile b/Dockerfile index 9672a92e..f5bb31b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ -FROM golang:1.10.2-alpine3.7 AS build +FROM golang:1.11.4-alpine3.8 AS build # Install tools required to build the project. # We need to run `docker build --no-cache .` to update those dependencies. RUN apk add --no-cache git -RUN go get github.com/golang/dep/cmd/dep +ENV DEP_RELEASE_TAG=v0.5.0 +RUN wget -O - https://raw.githubusercontent.com/golang/dep/master/install.sh | sh # Gopkg.toml and Gopkg.lock lists project dependencies. # These layers are only re-built when Gopkg files are updated. @@ -18,7 +19,7 @@ RUN dep ensure -vendor-only COPY . /go/src/github.com/kubeflow/mpi-operator/ RUN go build -o /bin/mpi-operator github.com/kubeflow/mpi-operator/cmd/mpi-operator -FROM alpine:3.7 +FROM alpine:3.8 COPY --from=build /bin/mpi-operator /bin/mpi-operator ENTRYPOINT ["/bin/mpi-operator"] CMD ["--help"] diff --git a/Gopkg.lock b/Gopkg.lock index 7be74788..6d3aa0b5 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -330,8 +330,8 @@ "storage/v1beta1", ] pruneopts = "" - revision = "05914d821849570fba9eacfb29466f2d8d3cd229" - version = "kubernetes-1.13.1" + revision = "67edc246be36579e46a89e29a2f165d47e012109" + version = "kubernetes-1.13.2" [[projects]] digest = "1:66b0292f815d508d11ed5fe94fdeb0bcc5a988703a08e73bf3cb3a415de676cf" @@ -382,10 +382,10 @@ ] pruneopts = "" revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd" - version = "kubernetes-1.13.1" + version = "kubernetes-1.13.2" [[projects]] - digest = "1:d603c9957fa66c90792d45fe0205d484da2ea364a01069c20890f2640b4a0fd5" + digest = "1:aba1a3f3caf30c176f83fc1fc0dc0f50bc0686f7648223e187c53895a91aad32" name = "k8s.io/client-go" packages = [ "discovery", @@ -560,8 +560,8 @@ "util/workqueue", ] pruneopts = "" - revision = "8d9ed539ba3134352c586810e749e58df4e94e4f" - version = "kubernetes-1.13.1" + revision = "6bf63545bd0257ed9e701ad95307ffa51b4407c0" + version = "kubernetes-1.13.2" [[projects]] digest = "1:d809e6c8dfa3448ae10f5624eff4ed1ebdc906755e7cea294c44e8b7ac0b077a" @@ -579,7 +579,7 @@ ] pruneopts = "" revision = "c2090bec4d9b1fb25de3812f868accc2bc9ecbae" - version = "kubernetes-1.13.1" + version = "kubernetes-1.13.2" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index bd8e73a5..23abf355 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -2,18 +2,18 @@ required = ["k8s.io/code-generator/cmd/client-gen"] [[override]] name = "k8s.io/code-generator" - version = "kubernetes-1.13.1" + version = "kubernetes-1.13.2" [[override]] name = "k8s.io/api" - version = "kubernetes-1.13.1" + version = "kubernetes-1.13.2" [[override]] name = "k8s.io/apimachinery" - version = "kubernetes-1.13.1" + version = "kubernetes-1.13.2" [[override]] name = "k8s.io/client-go" - version = "kubernetes-1.13.1" + version = "kubernetes-1.13.2" diff --git a/cmd/kubectl-delivery/Dockerfile b/cmd/kubectl-delivery/Dockerfile index 0a825327..1aca029c 100644 --- a/cmd/kubectl-delivery/Dockerfile +++ b/cmd/kubectl-delivery/Dockerfile @@ -1,13 +1,13 @@ -FROM alpine:3.7 AS build +FROM alpine:3.8 AS build # Install kubectl. -ENV K8S_VERSION v1.13.1 +ENV K8S_VERSION v1.13.2 RUN apk add --no-cache wget RUN wget -q https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl RUN chmod +x ./kubectl RUN mv ./kubectl /bin/kubectl -FROM alpine:3.7 +FROM alpine:3.8 COPY --from=build /bin/kubectl /bin/kubectl COPY deliver_kubectl.sh . ENTRYPOINT ["./deliver_kubectl.sh"]