Skip to content

Commit

Permalink
upgrade: bump to Go 1.12.6
Browse files Browse the repository at this point in the history
Signed-off-by: zhuangqh <zhuangqhc@gmail.com>
  • Loading branch information
zhuangqh authored and fuweid committed Jun 17, 2019
1 parent 02deee8 commit a8356de
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: required

language: go
go:
- 1.10.4
- 1.12.6

go_import_path: github.com/alibaba/pouch

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ctrd/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion test/z_cli_daemon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

{
Expand Down

0 comments on commit a8356de

Please sign in to comment.