Skip to content

Commit

Permalink
golang: update to 1.12.16
Browse files Browse the repository at this point in the history
Signed-off-by: André Martins <andre@cilium.io>
  • Loading branch information
aanm authored and gandro committed Jan 29, 2020
1 parent 31c495f commit ad36205
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dist: trusty
sudo: required

go:
- 1.12.15
- 1.12.16

if: branch = master OR type = pull_request

Expand All @@ -17,6 +17,6 @@ before_install: ./.travis/prepare.sh

before_script:
- export PATH=/usr/local/clang/bin:$PATH
- export GO=/home/travis/.gimme/versions/go1.12.15.linux.amd64/bin/go
- export GO=/home/travis/.gimme/versions/go1.12.16.linux.amd64/bin/go

script: ./.travis/build.sh
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM quay.io/cilium/cilium-envoy:9e8d7bb5e02d6038d6cf0ec3f28bf4019f3c7d79 as cil
# versions to be built while allowing the new versions to make changes
# that are not backwards compatible.
#
FROM quay.io/cilium/cilium-builder:2020-01-14-v1.5 as builder
FROM quay.io/cilium/cilium-builder:2020-01-29-v1.5 as builder
LABEL maintainer="maintainer@cilium.io"
WORKDIR /go/src/github.com/cilium/cilium
COPY . ./
Expand All @@ -37,7 +37,7 @@ RUN make LOCKDEBUG=$LOCKDEBUG PKG_BUILD=1 V=$V LIBNETWORK_PLUGIN=$LIBNETWORK_PLU
# built while allowing the new versions to make changes that are not
# backwards compatible.
#
FROM quay.io/cilium/cilium-runtime:2020-01-14-v1.5
FROM quay.io/cilium/cilium-runtime:2020-01-29-v1.5
LABEL maintainer="maintainer@cilium.io"
COPY --from=builder /tmp/install /
COPY --from=cilium-envoy / /
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ WORKDIR /go/src/github.com/cilium/cilium
ENV GOROOT /usr/local/go
ENV GOPATH /go
ENV PATH "$GOROOT/bin:$GOPATH/bin:$PATH"
ENV GO_VERSION 1.12.15
ENV GO_VERSION 1.12.16
#
# Build dependencies
Expand Down
2 changes: 1 addition & 1 deletion Documentation/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ contribute to Cilium:
+----------------------------------------------------------------------------------+--------------------------+-------------------------------------------------------------------------------+
| glibc-devel (32-bit) | latest | N/A (OS-specific) |
+----------------------------------------------------------------------------------+--------------------------+-------------------------------------------------------------------------------+
| `go <https://golang.org/dl/>`_ | 1.12.15 | N/A (OS-specific) |
| `go <https://golang.org/dl/>`_ | 1.12.16 | N/A (OS-specific) |
+----------------------------------------------------------------------------------+--------------------------+-------------------------------------------------------------------------------+
| `dep <https://github.com/golang/dep/>`_ | >= v0.4.1 | ``curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh`` |
+----------------------------------------------------------------------------------+--------------------------+-------------------------------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion cilium-docker-plugin.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/golang:1.12.15 as builder
FROM docker.io/library/golang:1.12.16 as builder
LABEL maintainer="maintainer@cilium.io"
ADD . /go/src/github.com/cilium/cilium
WORKDIR /go/src/github.com/cilium/cilium/plugins/cilium-docker
Expand Down
2 changes: 1 addition & 1 deletion cilium-operator.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/golang:1.12.15 as builder
FROM docker.io/library/golang:1.12.16 as builder
LABEL maintainer="maintainer@cilium.io"
ADD . /go/src/github.com/cilium/cilium
WORKDIR /go/src/github.com/cilium/cilium/operator
Expand Down
2 changes: 1 addition & 1 deletion contrib/packaging/docker/Dockerfile.runtime
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ apt-get clean
#
# Go-based tools we need at runtime
#
FROM docker.io/library/golang:1.12.15 as runtime-gobuild
FROM docker.io/library/golang:1.12.16 as runtime-gobuild
WORKDIR /tmp
RUN go get -u github.com/cilium/go-bindata/... && \
go get -u github.com/google/gops && \
Expand Down
2 changes: 1 addition & 1 deletion test/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
command: "etcd -name etcd0 -advertise-client-urls http://0.0.0.0:4002 -listen-client-urls http://0.0.0.0:4002 -initial-cluster-token etcd-cluster-1 -initial-cluster-state new"
privileged: true
base_image:
image: "quay.io/cilium/cilium-builder:2019-12-11-v1.5"
image: "quay.io/cilium/cilium-builder:2020-01-29-v1.5"
volumes:
- "./../:/go/src/github.com/cilium/cilium/"
privileged: true
Expand Down

0 comments on commit ad36205

Please sign in to comment.