diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9f09bd79f..198efcd58 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,8 +7,8 @@ RUN apt-get install --no-install-recommends -y build-essential file nano && \ apt-get autoremove --yes && \ rm -rf /var/lib/apt/lists/* -RUN wget https://dl.google.com/go/go1.16.10.linux-amd64.tar.gz && \ - tar -xvf go1.16.10.linux-amd64.tar.gz && \ +RUN wget https://dl.google.com/go/go1.17.9.linux-amd64.tar.gz && \ + tar -xvf go1.17.9.linux-amd64.tar.gz && \ mv go /usr/local RUN GOROOT=/usr/local/go /usr/local/go/bin/go install golang.org/x/tools/gopls@latest 2>&1 diff --git a/common.mk b/common.mk index 4cc40f524..8fbc69818 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.16.10 +BUILD_IMAGE := golang:1.17.9 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 5de818c54..4e0740a95 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.16 +go 1.17 require ( github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 diff --git a/plugins/apps/go.mod b/plugins/apps/go.mod index 1b96cedd7..56db09ced 100644 --- a/plugins/apps/go.mod +++ b/plugins/apps/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/apps -go 1.16 +go 1.17 require ( github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 diff --git a/plugins/builder/go.mod b/plugins/builder/go.mod index 93f3068ee..e0d4fbcbf 100644 --- a/plugins/builder/go.mod +++ b/plugins/builder/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/builder -go 1.16 +go 1.17 require ( github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 diff --git a/plugins/buildpacks/go.mod b/plugins/buildpacks/go.mod index cd66e8765..9dad32bf2 100644 --- a/plugins/buildpacks/go.mod +++ b/plugins/buildpacks/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/buildpacks -go 1.16 +go 1.17 require ( github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 diff --git a/plugins/common/go.mod b/plugins/common/go.mod index 56c8f0a8a..250c25ee2 100644 --- a/plugins/common/go.mod +++ b/plugins/common/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/common -go 1.16 +go 1.17 require ( github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 diff --git a/plugins/config/go.mod b/plugins/config/go.mod index 64e087679..24705c05b 100644 --- a/plugins/config/go.mod +++ b/plugins/config/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/config -go 1.16 +go 1.17 require ( github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 diff --git a/plugins/cron/go.mod b/plugins/cron/go.mod index 3918dd95c..bdf4ef151 100644 --- a/plugins/cron/go.mod +++ b/plugins/cron/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/cron -go 1.16 +go 1.17 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 65eeb402a..4740a56c4 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.16 +go 1.17 require github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 diff --git a/plugins/logs/go.mod b/plugins/logs/go.mod index 0c64d4a28..5865f2dea 100644 --- a/plugins/logs/go.mod +++ b/plugins/logs/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/logs -go 1.16 +go 1.17 require ( github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 diff --git a/plugins/network/go.mod b/plugins/network/go.mod index a34058e0d..df5215933 100644 --- a/plugins/network/go.mod +++ b/plugins/network/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/network -go 1.16 +go 1.17 require ( github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 diff --git a/plugins/nginx-vhosts/go.mod b/plugins/nginx-vhosts/go.mod index 07922a53d..9c2129303 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.16 +go 1.17 diff --git a/plugins/proxy/go.mod b/plugins/proxy/go.mod index a88c3cdc2..56fef3266 100644 --- a/plugins/proxy/go.mod +++ b/plugins/proxy/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/proxy -go 1.16 +go 1.17 require ( github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 diff --git a/plugins/ps/go.mod b/plugins/ps/go.mod index cdb884ecd..f6360356c 100644 --- a/plugins/ps/go.mod +++ b/plugins/ps/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/ps -go 1.16 +go 1.17 require ( github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 diff --git a/plugins/registry/go.mod b/plugins/registry/go.mod index d935e5bb9..f3784008c 100644 --- a/plugins/registry/go.mod +++ b/plugins/registry/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/registry -go 1.16 +go 1.17 require ( github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 diff --git a/plugins/repo/go.mod b/plugins/repo/go.mod index a4afdb66d..bf8e5b18d 100644 --- a/plugins/repo/go.mod +++ b/plugins/repo/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/repo -go 1.16 +go 1.17 require ( github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 diff --git a/plugins/resource/go.mod b/plugins/resource/go.mod index a5792de11..bb58af1f6 100644 --- a/plugins/resource/go.mod +++ b/plugins/resource/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/resource -go 1.16 +go 1.17 require ( github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 diff --git a/plugins/scheduler/go.mod b/plugins/scheduler/go.mod index 54dc95487..150ff6314 100644 --- a/plugins/scheduler/go.mod +++ b/plugins/scheduler/go.mod @@ -1,6 +1,6 @@ module github.com/dokku/dokku/plugins/scheduler -go 1.16 +go 1.17 require ( github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 diff --git a/tests/apps/zombies-buildpack/go.mod b/tests/apps/zombies-buildpack/go.mod index 7c980ac46..fb63b9fd9 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.16 -go 1.16 +// +heroku goVersion go1.17 +go 1.17 diff --git a/tests/apps/zombies-dockerfile-no-tini/go.mod b/tests/apps/zombies-dockerfile-no-tini/go.mod index a9f5c552a..d9cfa1839 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.16 +go 1.17 diff --git a/tests/apps/zombies-dockerfile-tini/go.mod b/tests/apps/zombies-dockerfile-tini/go.mod index a9f5c552a..d9cfa1839 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.16 +go 1.17