Skip to content

Commit

Permalink
update versions of k8s, go, alpine, dep (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
rongou authored and k8s-ci-robot committed Jan 19, 2019
1 parent b91c711 commit cbc53f6
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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"]
14 changes: 7 additions & 7 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"


6 changes: 3 additions & 3 deletions cmd/kubectl-delivery/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]

0 comments on commit cbc53f6

Please sign in to comment.