diff --git a/.travis.yml b/.travis.yml index 2b9ee31b8..2960e7d3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required language: go go: - - 1.10.4 + - 1.12.6 go_import_path: github.com/alibaba/pouch diff --git a/Dockerfile b/Dockerfile index 60dc55938..4dcbfa486 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update \ && apt-get clean # set go version this image use -ENV GO_VERSION=1.10.4 +ENV GO_VERSION=1.12.6 ENV ARCH=amd64 # install golang which version is GO_VERSION diff --git a/Vagrantfile b/Vagrantfile index 50affd7b3..acbfc01db 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -33,7 +33,7 @@ Vagrant.configure("2") do |config| if ENV["POUCH_BUILD"] == "true" pouch.vm.provision "shell", inline: <<-SHELL # configring environments for pouch - GO_VERSION=1.10.4 + GO_VERSION=1.12.6 GOROOT=/opt/go GOPATH=/root/go apt-get install -y --no-install-recommends build-essential diff --git a/ctrd/utils.go b/ctrd/utils.go index bed151369..ea94ad847 100644 --- a/ctrd/utils.go +++ b/ctrd/utils.go @@ -40,7 +40,7 @@ func withExitShimV1CheckpointTaskOpts() containerd.CheckpointTaskOpts { func (c *Client) isInsecureDomain(ref string) bool { u, err := url.Parse("dummy://" + ref) if err != nil { - logrus.Warning("failed to parse reference(%s) into url: %v", ref, err) + logrus.Warningf("failed to parse reference(%s) into url: %v", ref, err) return false } diff --git a/test/z_cli_daemon_test.go b/test/z_cli_daemon_test.go index 80c9de0cc..37b17d765 100644 --- a/test/z_cli_daemon_test.go +++ b/test/z_cli_daemon_test.go @@ -421,7 +421,7 @@ func (suite *PouchDaemonSuite) TestDaemonTlsVerify(c *check.C) { // Do not use TLS should fail result = RunWithSpecifiedDaemon(&dcfg, "version") c.Assert(result.ExitCode, check.Equals, 1) - err := util.PartialEqual(result.Stderr(), "malformed HTTP response") + err := util.PartialEqual(result.Stderr(), "Client sent an HTTP request to an HTTPS server") c.Assert(err, check.IsNil) {