Skip to content
This repository has been archived by the owner on Dec 20, 2024. It is now read-only.

Commit

Permalink
feature: upgrade golang version to 1.12.10
Browse files Browse the repository at this point in the history
Related to: dragonflyoss/dragonfly#989

Signed-off-by: fengzixu <[email protected]>
  • Loading branch information
fengzixu committed Oct 16, 2019
1 parent bb999f2 commit 3bf86b8
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
* Contact with the community's [maintainers](MAINTAINERS.md) offline
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.supernode
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/dfdaemon/app/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
`
}
2 changes: 1 addition & 1 deletion cmd/dfget/app/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
`
}
2 changes: 1 addition & 1 deletion cmd/supernode/app/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
`
}
2 changes: 1 addition & 1 deletion docs/cli_reference/dfdaemon_version.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion docs/cli_reference/dfget_version.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion hack/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3bf86b8

Please sign in to comment.