Merge pull request #4273 from dokku/upgrade-golang

Upgrade to golang 1.15
2020-12-25 03:05:19 -05:00
parent 98e57287e3 bacc5cbcab
commit b39623ab2b
14 changed files with 14 additions and 14 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.14.4
+BUILD_IMAGE := golang:1.15.6

 .PHONY: build-in-docker build clean src-clean

--- 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.14
+go 1.15

 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.14
+go 1.15

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

-go 1.14
+go 1.15

 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.14
+go 1.15

 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.14
+go 1.15

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect
--- 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.14
+go 1.15

 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.14
+go 1.15

 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.14
+go 1.15

 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.14
+go 1.15
--- a/plugins/proxy/go.mod
+++ b/plugins/proxy/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/proxy

-go 1.14
+go 1.15

 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.14
+go 1.15

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

-go 1.14
+go 1.15

 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.14
+go 1.15

 require (
 	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect