diff --git a/common.mk b/common.mk index c147b4e3ce8..4cc40f52433 100644 --- 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) diff --git a/plugins/app-json/go.mod b/plugins/app-json/go.mod index bccdd308d35..94e63cdeb75 100644 --- 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 diff --git a/plugins/apps/go.mod b/plugins/apps/go.mod index 3517791ed56..56b1a9d097b 100644 --- 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 diff --git a/plugins/builder/go.mod b/plugins/builder/go.mod index e96f12bc1da..7bc482c0ef4 100644 --- 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 diff --git a/plugins/buildpacks/go.mod b/plugins/buildpacks/go.mod index 76d84e4c3c6..213ff4554ce 100644 --- 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 diff --git a/plugins/common/go.mod b/plugins/common/go.mod index 8fc5569f7b1..20756ba2dad 100644 --- 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 diff --git a/plugins/config/go.mod b/plugins/config/go.mod index 998dfe57ba3..aa431830ccc 100644 --- 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 diff --git a/plugins/cron/go.mod b/plugins/cron/go.mod index 822b875bd3a..a18eb7f93d2 100644 --- 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 diff --git a/plugins/docker-options/go.mod b/plugins/docker-options/go.mod index 51e89dae882..506edaa0607 100644 --- 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 diff --git a/plugins/logs/go.mod b/plugins/logs/go.mod index ba17db430e7..9aa80e33788 100644 --- 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 diff --git a/plugins/network/go.mod b/plugins/network/go.mod index 418e99a94a1..2561c086cd4 100644 --- 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 diff --git a/plugins/nginx-vhosts/go.mod b/plugins/nginx-vhosts/go.mod index 2aa87d05840..07922a53dc4 100644 --- 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 diff --git a/plugins/proxy/go.mod b/plugins/proxy/go.mod index 2fc13f3100d..39d599ef6eb 100644 --- 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 diff --git a/plugins/ps/go.mod b/plugins/ps/go.mod index 4655cac0600..f1a8a7d1cae 100644 --- 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 diff --git a/plugins/registry/go.mod b/plugins/registry/go.mod index a0a8fcac095..eb9d88ce0e1 100644 --- 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 diff --git a/plugins/repo/go.mod b/plugins/repo/go.mod index 03600504a4b..a6d13cfd9cf 100644 --- 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 diff --git a/plugins/resource/go.mod b/plugins/resource/go.mod index 979a726751d..af5e39bc007 100644 --- 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 diff --git a/plugins/scheduler/go.mod b/plugins/scheduler/go.mod index 82e5869da01..3ad51cb24cd 100644 --- 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 diff --git a/tests/apps/zombies-buildpack/go.mod b/tests/apps/zombies-buildpack/go.mod index d0bf479168c..7c980ac468f 100644 --- 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 diff --git a/tests/apps/zombies-dockerfile-no-tini/go.mod b/tests/apps/zombies-dockerfile-no-tini/go.mod index 232b9d2a14d..a9f5c552a10 100644 --- 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 diff --git a/tests/apps/zombies-dockerfile-tini/go.mod b/tests/apps/zombies-dockerfile-tini/go.mod index 232b9d2a14d..a9f5c552a10 100644 --- 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