From 3bf86b884b31585e24aa509f4624edb4a6426753 Mon Sep 17 00:00:00 2001 From: fengzixu Date: Wed, 16 Oct 2019 14:26:56 +0900 Subject: [PATCH] feature: upgrade golang version to 1.12.10 Related to: https://github.com/dragonflyoss/Dragonfly/issues/989 Signed-off-by: fengzixu --- .circleci/config.yml | 4 ++-- CONTRIBUTING.md | 4 ++-- Dockerfile | 2 +- Dockerfile.supernode | 2 +- cmd/dfdaemon/app/version.go | 2 +- cmd/dfget/app/version.go | 2 +- cmd/supernode/app/version.go | 2 +- docs/cli_reference/dfdaemon_version.md | 2 +- docs/cli_reference/dfget_version.md | 2 +- hack/build.sh | 2 +- test/README.md | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 66e0cb0d1..3ba03660a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,7 +56,7 @@ jobs: unit-test-golang: docker: - - image: circleci/golang:1.12.6 + - image: circleci/golang:1.12.10 working_directory: /go/src/github.com/dragonflyoss/Dragonfly steps: - checkout @@ -76,7 +76,7 @@ jobs: api-integration-test: docker: - - image: circleci/golang:1.12.6 + - image: circleci/golang:1.12.10 working_directory: /go/src/github.com/dragonflyoss/Dragonfly steps: - checkout diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 31b03aeeb..6c2aaadf2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -147,7 +147,7 @@ PR is the only way to make change to Dragonfly project files. To help reviewers As a contributor, if you want to make any contribution to Dragonfly project, we should reach an agreement on the version of tools used in the development environment. Here are some dependents with specific version: -* golang : v1.12.6 +* golang : v1.12.10 * swagger : 0.19.0 * markdownlint : v0.5.0 * misspell : latest @@ -216,4 +216,4 @@ It is also welcomed to join Dragonfly team if you are willing to participate in You can do it in either of two ways: * Submit a PR in the [dragonflyoss/Dragonfly](https://github.com/dragonflyoss/Dragonfly) repo -* Contact with the community's [maintainers](MAINTAINERS.md) offline \ No newline at end of file +* Contact with the community's [maintainers](MAINTAINERS.md) offline diff --git a/Dockerfile b/Dockerfile index 875e8d778..e99b9f1eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.12.6-alpine as builder +FROM golang:1.12.10-alpine as builder WORKDIR /go/src/github.com/dragonflyoss/Dragonfly RUN apk --no-cache add bash make gcc libc-dev git diff --git a/Dockerfile.supernode b/Dockerfile.supernode index 5da9d2217..0300e660b 100644 --- a/Dockerfile.supernode +++ b/Dockerfile.supernode @@ -1,4 +1,4 @@ -FROM golang:1.12.6-alpine as builder +FROM golang:1.12.10-alpine as builder WORKDIR /go/src/github.com/dragonflyoss/Dragonfly RUN apk --no-cache add bash make gcc libc-dev git diff --git a/cmd/dfdaemon/app/version.go b/cmd/dfdaemon/app/version.go index 7c9e0749d..888f6b197 100644 --- a/cmd/dfdaemon/app/version.go +++ b/cmd/dfdaemon/app/version.go @@ -50,7 +50,7 @@ func versionExample() string { return `dfdaemon version 0.4.1 Git commit: 6fd5c8f Build date: 20190717-15:57:52 - Go version: go1.12.6 + Go version: go1.12.10 OS/Arch: linux/amd64 ` } diff --git a/cmd/dfget/app/version.go b/cmd/dfget/app/version.go index de703d8f2..57047a41e 100644 --- a/cmd/dfget/app/version.go +++ b/cmd/dfget/app/version.go @@ -50,7 +50,7 @@ func versionExample() string { return `dfget version 0.4.1 Git commit: 6fd5c8f Build date: 20190717-15:57:52 - Go version: go1.12.6 + Go version: go1.12.10 OS/Arch: linux/amd64 ` } diff --git a/cmd/supernode/app/version.go b/cmd/supernode/app/version.go index a315176f0..11b8d3f40 100644 --- a/cmd/supernode/app/version.go +++ b/cmd/supernode/app/version.go @@ -50,7 +50,7 @@ func versionExample() string { return `supernode version 0.4.1 Git commit: 6fd5c8f Build date: 20190717-15:57:52 - Go version: go1.12.6 + Go version: go1.12.10 OS/Arch: linux/amd64 ` } diff --git a/docs/cli_reference/dfdaemon_version.md b/docs/cli_reference/dfdaemon_version.md index 6ee431de3..dd45b32cb 100644 --- a/docs/cli_reference/dfdaemon_version.md +++ b/docs/cli_reference/dfdaemon_version.md @@ -16,7 +16,7 @@ dfdaemon version [flags] dfdaemon version 0.4.1 Git commit: 6fd5c8f Build date: 20190717-15:57:52 - Go version: go1.12.6 + Go version: go1.12.10 OS/Arch: linux/amd64 ``` diff --git a/docs/cli_reference/dfget_version.md b/docs/cli_reference/dfget_version.md index ea9fe3a61..564d3da1c 100644 --- a/docs/cli_reference/dfget_version.md +++ b/docs/cli_reference/dfget_version.md @@ -16,7 +16,7 @@ dfget version [flags] dfget version 0.4.1 Git commit: 6fd5c8f Build date: 20190717-15:57:52 - Go version: go1.12.6 + Go version: go1.12.10 OS/Arch: linux/amd64 ``` diff --git a/hack/build.sh b/hack/build.sh index 34f609e04..928660573 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -8,7 +8,7 @@ DFDAEMON_BINARY_NAME=dfdaemon DFGET_BINARY_NAME=dfget SUPERNODE_BINARY_NAME=supernode PKG=github.com/dragonflyoss/Dragonfly -BUILD_IMAGE=golang:1.12.6 +BUILD_IMAGE=golang:1.12.10 VERSION=$(git describe --tags "$(git rev-list --tags --max-count=1)") REVISION=$(git rev-parse --short HEAD) DATE=$(date "+%Y%m%d-%H:%M:%S") diff --git a/test/README.md b/test/README.md index ea1d4d2a4..91cd1f9ec 100644 --- a/test/README.md +++ b/test/README.md @@ -77,7 +77,7 @@ In order to run unit-test or integration test, install go and configure go envir ``` shell # go version -go version go1.12.6 linux/amd64 +go version go1.12.10 linux/amd64 # which go /usr/local/go/bin/go # env |grep GO