etcd: Bump to etcd v3.3 and golang 1.9

This moves us to etcd v3.3 (a new major release) which has some useful
features but that requires version 1.9 of golang.
This commit is contained in:
James Shubin
2018-02-15 12:32:22 -05:00
parent 27e51f1bcb
commit 9ba893c06c
10 changed files with 10 additions and 12 deletions

View File

@@ -3,7 +3,6 @@ os:
- linux - linux
- osx - osx
go: go:
- 1.8.x
- 1.9.x - 1.9.x
- tip - tip
go_import_path: github.com/purpleidea/mgmt go_import_path: github.com/purpleidea/mgmt
@@ -19,7 +18,6 @@ matrix:
fast_finish: false fast_finish: false
allow_failures: allow_failures:
- go: tip - go: tip
- go: 1.9.x
- os: osx - os: osx
notifications: notifications:
irc: irc:

View File

@@ -1,4 +1,4 @@
FROM golang:1.8 FROM golang:1.9
MAINTAINER Michał Czeraszkiewicz <contact@czerasz.com> MAINTAINER Michał Czeraszkiewicz <contact@czerasz.com>

View File

@@ -1,4 +1,4 @@
FROM golang:1.8 FROM golang:1.9
MAINTAINER Michał Czeraszkiewicz <contact@czerasz.com> MAINTAINER Michał Czeraszkiewicz <contact@czerasz.com>

View File

@@ -11,7 +11,7 @@ Once you're familiar with the general idea, please start hacking...
## Quick start ## Quick start
### Installing golang ### Installing golang
* You need golang version 1.8 or greater installed. * You need golang version 1.9 or greater installed.
** To install on rpm style systems: `sudo dnf install golang` ** To install on rpm style systems: `sudo dnf install golang`
** To install on apt style systems: `sudo apt install golang` ** To install on apt style systems: `sudo apt install golang`
** To install on macOS systems install [Homebrew](https://brew.sh) and run: `brew install go` ** To install on macOS systems install [Homebrew](https://brew.sh) and run: `brew install go`
@@ -64,7 +64,7 @@ dependencies, _runtime_ dependencies, and additionally, a few extra dependencies
required for running the _test_ suite. required for running the _test_ suite.
### Build ### Build
* `golang` 1.8 or higher (required, available in some distros and distributed * `golang` 1.9 or higher (required, available in some distros and distributed
as a binary officially by [golang.org](https://golang.org/dl/)) as a binary officially by [golang.org](https://golang.org/dl/))
### Runtime ### Runtime

View File

@@ -144,7 +144,7 @@ func (obj *Prometheus) Start() error {
// Stop the http server. // Stop the http server.
func (obj *Prometheus) Stop() error { func (obj *Prometheus) Stop() error {
// TODO: There is no way in go < 1.8 to stop a http server. // FIXME: There is no way in go < 1.8 to stop a http server. Add this!
// https://stackoverflow.com/questions/39320025/go-how-to-stop-http-listenandserve/41433555#41433555 // https://stackoverflow.com/questions/39320025/go-how-to-stop-http-listenandserve/41433555#41433555
return nil return nil
} }