Upgrade CI job golang version v1.20

cabify · Aug 7, 2023 · bb9e3b2 · bb9e3b2
1 parent 41140d8
commit bb9e3b2
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 11 deletions.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -13,9 +13,7 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - '~1.13'
-          - '~1.14'
-          - '~1.15'
+          - '~1.20'
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2

diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,20 @@
+dist: focal
+
 language: go
 
+go:
+  - 1.20.x
+
 services:
   - docker
 
+# https://docs.travis-ci.com/user/docker/#installing-a-newer-docker-version
+before_install:
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get update
+  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+
 env:
   - GO111MODULE=on
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.0] - 2023-07-26
+### Update
+- Update `docker/docker` version
+
 ## [0.3.0] - 2020-11-20
 ### Added
 - `Runner.StopWithTimeout` and `Config.StopTimeout` to stop containers within the provided time, 0 by default to reduce the tear down time.

diff --git a/acceptance/aceptadora.yml b/acceptance/aceptadora.yml
@@ -1,7 +1,7 @@
 services:
   redis:
     # image has to be in the canonical format, i.e., an image called `redis` is actually docker.io/library/redis
-    image: docker.io/library/redis:3.0.7
+    image: docker.io/library/redis:6.0.20
     # ports is a usual mapping like in docker compose, notice that depending on the env it will be mapped on the localhost
     # or on whatever host is running the docker (like host `docker` in gitlab) so we don't bind the ports on 127.0.0.1
     # if you're really concerned about security, an option would be to define a MAYBE_BIND_PORT in each of the env vars files as:

diff --git a/acceptance/fixtures/proxy/go.mod b/acceptance/fixtures/proxy/go.mod
@@ -1,3 +1,3 @@
 module cabify.local/service
 
-go 1.14
+go 1.20
diff --git a/acceptance/go.mod b/acceptance/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/Microsoft/go-winio v0.4.14 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/distribution v2.7.1+incompatible // indirect
+	github.com/docker/distribution v2.8.2+incompatible // indirect
 	github.com/docker/docker v24.0.5+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect

diff --git a/acceptance/go.sum b/acceptance/go.sum
@@ -7,8 +7,8 @@ github.com/colega/envconfig v0.1.0/go.mod h1:XFA1goH4UcSGbmAo6QSdO4u7Os+vT0AySke
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
-github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
+github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY=
 github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/cabify/aceptadora
 go 1.20
 
 require (
-	github.com/docker/distribution v2.7.1+incompatible
+	github.com/docker/distribution v2.8.2+incompatible
 	github.com/docker/docker v24.0.5+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/stretchr/testify v1.3.0

diff --git a/go.sum b/go.sum
@@ -4,8 +4,8 @@ github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jB
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
-github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
+github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY=
 github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=