Merge pull request #4917 from dokku/upgrade-golang

Update golang to fix golang tests
2025-12-29 00:25:08 +01:00 · 2021-11-11 18:04:04 -05:00
parent daf574188a 9a403aa1ce
commit 4cd9feae7b
21 changed files with 22 additions and 22 deletions
--- a/common.mk
+++ b/common.mk
@@ -1,7 +1,7 @@
 GO_ARGS ?=
 GO_PLUGIN_MAKE_TARGET ?= build
 GO_REPO_ROOT := /go/src/github.com/dokku/dokku
-BUILD_IMAGE := golang:1.15.6
+BUILD_IMAGE := golang:1.16.10
 GO_BUILD_CACHE ?= /tmp/dokku-go-build-cache
 GO_MOD_CACHE   ?= /tmp/dokku-go-mod-mod
 GO_ROOT_MOUNT  ?= $$PWD/../..:$(GO_REPO_ROOT)
--- a/plugins/app-json/go.mod
+++ b/plugins/app-json/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/app-json

-go 1.15
+go 1.16

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect
--- a/plugins/apps/go.mod
+++ b/plugins/apps/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/apps

-go 1.15
+go 1.16

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect
--- a/plugins/builder/go.mod
+++ b/plugins/builder/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/builder

-go 1.15
+go 1.16

 require (
 	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0
--- a/plugins/buildpacks/go.mod
+++ b/plugins/buildpacks/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/buildpacks

-go 1.15
+go 1.16

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect
--- a/plugins/common/go.mod
+++ b/plugins/common/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/common

-go 1.15
+go 1.16

 require (
 	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
--- a/plugins/config/go.mod
+++ b/plugins/config/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/config

-go 1.15
+go 1.16

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect
--- a/plugins/cron/go.mod
+++ b/plugins/cron/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/cron

-go 1.15
+go 1.16

 require (
 	github.com/dokku/dokku/plugins/app-json v0.0.0-00010101000000-000000000000
--- a/plugins/docker-options/go.mod
+++ b/plugins/docker-options/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/docker-options

-go 1.15
+go 1.16

 require (
  github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect
--- a/plugins/logs/go.mod
+++ b/plugins/logs/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/logs

-go 1.15
+go 1.16

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27
--- a/plugins/network/go.mod
+++ b/plugins/network/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/network

-go 1.15
+go 1.16

 require (
 	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0
--- a/plugins/nginx-vhosts/go.mod
+++ b/plugins/nginx-vhosts/go.mod
@@ -1,3 +1,3 @@
 module github.com/dokku/dokku/plugins/nginx-vhosts

-go 1.15
+go 1.16
--- a/plugins/proxy/go.mod
+++ b/plugins/proxy/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/proxy

-go 1.15
+go 1.16

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect
--- a/plugins/ps/go.mod
+++ b/plugins/ps/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/ps

-go 1.15
+go 1.16

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27
--- a/plugins/registry/go.mod
+++ b/plugins/registry/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/registry

-go 1.15
+go 1.16

 require (
  github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0
--- a/plugins/repo/go.mod
+++ b/plugins/repo/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/repo

-go 1.15
+go 1.16

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect
--- a/plugins/resource/go.mod
+++ b/plugins/resource/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/resource

-go 1.15
+go 1.16

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect
--- a/plugins/scheduler/go.mod
+++ b/plugins/scheduler/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/scheduler

-go 1.15
+go 1.16

 require (
 	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0
--- a/tests/apps/zombies-buildpack/go.mod
+++ b/tests/apps/zombies-buildpack/go.mod
@@ -1,4 +1,4 @@
 module dokku.me/web

-// +heroku goVersion go1.12
-go 1.12
+// +heroku goVersion go1.16
+go 1.16
--- a/tests/apps/zombies-dockerfile-no-tini/go.mod
+++ b/tests/apps/zombies-dockerfile-no-tini/go.mod
@@ -1,3 +1,3 @@
 module dokku.me/web

-go 1.12
+go 1.16
--- a/tests/apps/zombies-dockerfile-tini/go.mod
+++ b/tests/apps/zombies-dockerfile-tini/go.mod
@@ -1,3 +1,3 @@
 module dokku.me/web

-go 1.12
+go 1.16