diff --git a/.circleci/config.yml b/.circleci/config.yml index 623f08994..47de30397 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: working_directory: ~/go/src/github.com/fnproject/fn environment: # apparently expansion doesn't work here yet: https://discuss.circleci.com/t/environment-variable-expansion-in-working-directory/11322 - GOPATH=/home/circleci/go - - GOVERSION=1.9.1 + - GOVERSION=1.10 - OS=linux - ARCH=amd64 - FN_LOG_LEVEL=debug diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a4aecac74..566c221e3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,7 +53,7 @@ asking for suggestions on how to address the documentation part. ### Build -Requires Go >= 1.9.1. +Requires Go >= 1.10.0. The first time after you clone or after dependencies get updated, run: diff --git a/Dockerfile b/Dockerfile index 689679365..99c37b66e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM golang:1.9-alpine AS build-env +FROM golang:1.10-alpine AS build-env RUN apk --no-cache add build-base git bzr mercurial gcc ENV D=/go/src/github.com/fnproject/fn ADD . $D diff --git a/images/api/Dockerfile b/images/api/Dockerfile index e65e341dd..b3d3f0078 100644 --- a/images/api/Dockerfile +++ b/images/api/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM golang:1.9-alpine AS build-env +FROM golang:1.10-alpine AS build-env RUN apk --no-cache add build-base git bzr mercurial gcc ENV D=/go/src/github.com/fnproject/fn ADD . $D diff --git a/images/fn-test-utils/Dockerfile b/images/fn-test-utils/Dockerfile index bfd6d4e7d..08ee92204 100644 --- a/images/fn-test-utils/Dockerfile +++ b/images/fn-test-utils/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM golang:1.9-alpine AS build-env +FROM golang:1.10-alpine AS build-env RUN apk --no-cache add git ENV D=/go/src/github.com/fnproject/fn/images/fn-test-utils RUN go get -u github.com/golang/dep/cmd/dep diff --git a/images/fnnpm/Dockerfile b/images/fnnpm/Dockerfile index 0f5aaf8d0..9bf496c2d 100644 --- a/images/fnnpm/Dockerfile +++ b/images/fnnpm/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM golang:1.9-alpine AS build-env +FROM golang:1.10-alpine AS build-env RUN apk --no-cache add build-base git bzr mercurial gcc ENV D=/go/src/github.com/fnproject/fn ADD . $D diff --git a/images/hello/Dockerfile b/images/hello/Dockerfile index 3d9e57cce..3248165d2 100644 --- a/images/hello/Dockerfile +++ b/images/hello/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM golang:alpine AS build-env +FROM golang:1.10-alpine AS build-env ADD . /src RUN cd /src && go build -o goapp diff --git a/images/lb/Dockerfile b/images/lb/Dockerfile index f38ac1726..57ddca87e 100644 --- a/images/lb/Dockerfile +++ b/images/lb/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM golang:1.9-alpine AS build-env +FROM golang:1.10-alpine AS build-env RUN apk --no-cache add build-base git bzr mercurial gcc ENV D=/go/src/github.com/fnproject/fn ADD . $D diff --git a/images/runner/Dockerfile b/images/runner/Dockerfile index 74431f750..6d512e4d8 100644 --- a/images/runner/Dockerfile +++ b/images/runner/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM golang:1.9-alpine AS build-env +FROM golang:1.10-alpine AS build-env RUN apk --no-cache add build-base git bzr mercurial gcc ENV D=/go/src/github.com/fnproject/fn ADD . $D