Vulnerability updates (#657)

* vulnerability vixes (trivy scan 14.03.22)

* vuln-updates - build fix(#656)

Co-authored-by: AndriiMysko <[email protected]>

Author: GbArc

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 
-go: 1.14.x
+go: 1.17.x
 
 dist: xenial
 
@@ -35,7 +35,7 @@ jobs:
   include:
   - stage: test
     name: linux
-    go: 1.14.x
+    go: 1.17.x
     script:
     - make deps
     - make lintall
@@ -58,7 +58,7 @@ jobs:
         - travis-ci/worker/$TRAVIS_BRANCH
   - stage: test
     name: crossbuild
-    go: 1.14.x
+    go: 1.17.x
     script:
     - GO111MODULE=on make build/darwin/amd64/travis-worker
     addons:

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14 as builder
+FROM golang:1.17 as builder
 MAINTAINER Travis CI GmbH <[email protected]>
 
 COPY . /go/src/github.com/travis-ci/worker

backend/docker.go

@@ -472,7 +472,7 @@ func (p *dockerProvider) Start(ctx gocontext.Context, startAttributes *StartAttr
 	}).Debug("creating container")
 
 	container, err := p.client.ContainerCreate(
-		ctx, dockerConfig, dockerHostConfig, nil, containerName)
+		ctx, dockerConfig, dockerHostConfig, nil, nil, containerName)
 
 	if err != nil {
 		logger.WithField("err", err).Error("couldn't create container")

backend/docker_test.go

@@ -357,7 +357,7 @@ func TestNewDockerProvider_WithInvalidInspectInterval(t *testing.T) {
 	defer dockerTestTeardown()
 
 	assert.NotNil(t, err)
-	assert.Equal(t, "time: invalid duration mraaaaaaa", err.Error())
+	assert.Equal(t, "time: invalid duration \"mraaaaaaa\"", err.Error())
 	assert.Nil(t, provider)
 }
 

go.mod

@@ -3,33 +3,24 @@ module github.com/travis-ci/worker
 go 1.12
 
 require (
-	cloud.google.com/go v0.26.0
+	cloud.google.com/go v0.81.0
 	contrib.go.opencensus.io/exporter/stackdriver v0.5.0
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4 // indirect
 	github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022 // indirect
 	github.com/Jeffail/tunny v0.0.0-20180304204616-59cfa8fcb19f
-	github.com/Microsoft/go-winio v0.4.11 // indirect
-	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
 	github.com/aws/aws-sdk-go v1.15.31
-	github.com/bitly/go-simplejson v0.0.0-20171023175154-0c965951289c
+	github.com/bitly/go-simplejson v0.5.0
 	github.com/cenk/backoff v2.1.0+incompatible
-	github.com/certifi/gocertifi v0.0.0-20180905225744-ee1a9a0726d2 // indirect
-	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/docker/docker v0.0.0-20181012164311-10ebe6381e1f
-	github.com/docker/go-connections v0.0.0-20180821093606-97c2040d34df
-	github.com/docker/go-units v0.3.3 // indirect
+	github.com/containerd/containerd v1.6.1 // indirect
+	github.com/docker/docker v20.10.13+incompatible
+	github.com/docker/go-connections v0.4.0
 	github.com/dustin/go-humanize v1.0.0
 	github.com/dylanmei/iso8601 v0.1.0 // indirect
 	github.com/flosch/pongo2 v0.0.0-20190505152737-8914e1cf9164 // indirect
 	github.com/garyburd/redigo v0.0.0-20180404160726-569eae59ada9
-	github.com/getsentry/raven-go v0.0.0-20180903072508-084a9de9eb03
-	github.com/gogo/protobuf v1.2.1 // indirect
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
-	github.com/google/uuid v1.1.0 // indirect
-	github.com/googleapis/gax-go v2.0.0+incompatible // indirect
-	github.com/gorilla/mux v0.0.0-20181012153151-deb579d6e030
-	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/getsentry/raven-go v0.2.0
+	github.com/gorilla/mux v1.7.3
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/jtacoma/uritemplates v1.0.0
 	github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c // indirect
 	github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect
@@ -44,42 +35,31 @@ require (
 	github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9 // indirect
 	github.com/masterzen/winrm v0.0.0-20180702085143-58761a495ca4
 	github.com/mihasya/go-metrics-librato v0.0.0-20171227215858-c2a1624c7a80
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/mitchellh/multistep v0.0.0-20170316185339-391576a156a5
+	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
-	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db
 	github.com/pborman/uuid v1.2.0
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.9.1
 	github.com/pkg/sftp v1.8.3
 	github.com/rackspace/gophercloud v0.0.0-20161013232434-e00690e87603
 	github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165
-	github.com/rogpeppe/fastuuid v1.1.0 // indirect
-	github.com/sirupsen/logrus v0.0.0-20181010200618-458213699411
-	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
+	github.com/sirupsen/logrus v1.8.1
 	github.com/streadway/amqp v0.0.0-20180806233856-70e15c650864
-	github.com/stretchr/testify v1.2.2
-	go.opencensus.io v0.15.0
-	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
-	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
-	golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced
-	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
-	golang.org/x/text v0.3.6 // indirect
-	golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
-	google.golang.org/api v0.0.0-20181012000736-72df7e5ac770
-	google.golang.org/appengine v1.2.0 // indirect
-	google.golang.org/genproto v0.0.0-20181004005441-af9cb2a35e7f // indirect
-	google.golang.org/grpc v1.14.0 // indirect
+	github.com/stretchr/testify v1.7.0
+	go.opencensus.io v0.23.0
+	golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000
+	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	google.golang.org/api v0.43.0
 	gopkg.in/httprequest.v1 v1.2.0 // indirect
 	gopkg.in/juju/environschema.v1 v1.0.0 // indirect
 	gopkg.in/macaroon-bakery.v2 v2.1.0 // indirect
 	gopkg.in/macaroon.v2 v2.1.0 // indirect
 	gopkg.in/retry.v1 v1.0.3 // indirect
 	gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 // indirect
 	gopkg.in/urfave/cli.v1 v1.20.0
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gotest.tools v2.2.0+incompatible // indirect
 )
 
 replace github.com/go-check/check v1.0.0-20180628173108-788fd7840127 => github.com/go-check/check v0.0.0-20180628173108-788fd7840127