golang: update to 1.13.4

Signed-off-by: André Martins <andre@cilium.io>
jessfraz · Nov 7, 2019 · 92b3cfc · 92b3cfc
1 parent a5f4964
commit 92b3cfc
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ dist: trusty
 sudo: required
 
 go:
- - 1.13.3
+ - 1.13.4
 
 if: branch = master OR type = pull_request
 
@@ -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.13.3.linux.amd64/bin/go
+  - export GO=/home/travis/.gimme/versions/go1.13.4.linux.amd64/bin/go
 
 script: ./.travis/build.sh
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ FROM quay.io/cilium/cilium-envoy:c6d564bb08632a09947bfe224096379df4775ccd 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:2019-10-18 as builder
+FROM quay.io/cilium/cilium-builder:2019-11-06 as builder
 LABEL maintainer="maintainer@cilium.io"
 WORKDIR /go/src/github.com/cilium/cilium
 COPY . ./
@@ -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:2019-10-18
+FROM quay.io/cilium/cilium-runtime:2019-11-06
 LABEL maintainer="maintainer@cilium.io"
 COPY --from=builder /tmp/install /
 COPY --from=cilium-envoy / /

diff --git a/Dockerfile.builder b/Dockerfile.builder
@@ -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.13.3
+ENV GO_VERSION 1.13.4
 
 #
 # Build dependencies

diff --git a/Documentation/contributing/development/dev_setup.rst b/Documentation/contributing/development/dev_setup.rst
@@ -22,7 +22,7 @@ contribute to Cilium:
 +----------------------------------------------------------------------------------+--------------------------+-------------------------------------------------------------------------------+
 |  glibc-devel (32-bit)                                                            | latest                   | N/A (OS-specific)                                                             |
 +----------------------------------------------------------------------------------+--------------------------+-------------------------------------------------------------------------------+
-| `go <https://golang.org/dl/>`_                                                   | 1.13.3                   | N/A (OS-specific)                                                             |
+| `go <https://golang.org/dl/>`_                                                   | 1.13.4                   | N/A (OS-specific)                                                             |
 +----------------------------------------------------------------------------------+--------------------------+-------------------------------------------------------------------------------+
 | `go-bindata <https://github.com/cilium/go-bindata>`_                             | ``a0ff2567cfb``          | ``go get -u github.com/cilium/go-bindata/...``                                |
 +----------------------------------------------------------------------------------+--------------------------+-------------------------------------------------------------------------------+

diff --git a/GO_VERSION b/GO_VERSION
@@ -1 +1 @@
-1.13.3
+1.13.4
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ JOB_BASE_NAME ?= cilium_test
 
 UTC_DATE=$(shell date -u "+%Y-%m-%d")
 
-GO_VERSION := 1.13.3
+GO_VERSION := 1.13.4
 
 # Since there's a bug with NFS or the kernel, the flock syscall hangs the documentation
 # build in the developer VM. For this reason the documentation build is skipped if NFS

diff --git a/cilium-docker-plugin.Dockerfile b/cilium-docker-plugin.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.13.3 as builder
+FROM docker.io/library/golang:1.13.4 as builder
 LABEL maintainer="maintainer@cilium.io"
 ADD . /go/src/github.com/cilium/cilium
 WORKDIR /go/src/github.com/cilium/cilium/plugins/cilium-docker

diff --git a/cilium-operator.Dockerfile b/cilium-operator.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.13.3 as builder
+FROM docker.io/library/golang:1.13.4 as builder
 LABEL maintainer="maintainer@cilium.io"
 ADD . /go/src/github.com/cilium/cilium
 WORKDIR /go/src/github.com/cilium/cilium/operator

diff --git a/contrib/packaging/docker/Dockerfile.runtime b/contrib/packaging/docker/Dockerfile.runtime
@@ -79,7 +79,7 @@ apt-get clean
 #
 # Go-based tools we need at runtime
 #
-FROM docker.io/library/golang:1.13.3 as runtime-gobuild
+FROM docker.io/library/golang:1.13.4 as runtime-gobuild
 WORKDIR /tmp
 RUN go get -d github.com/google/gops && \
 cd /go/src/github.com/google/gops && \

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -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-10-18"
+    image: "quay.io/cilium/cilium-builder:2019-11-06"
     volumes:
       - "./../:/go/src/github.com/cilium/cilium/"
     privileged: true