Merge pull request #22149 from luxas/onedotsix
Automatic merge from submit-queue Up to golang 1.6 A second attempt to upgrade go version above `go1.4` Merge ASAP after you've cut the `release-1.2` branch and feel ready. `go1.6` should perform slightly better than `go1.5`, so this time it might work @gmarek @wojtek-t @zmerlynn @mikedanese @brendandburns @ixdy @thockin
This commit is contained in:
@@ -27,7 +27,7 @@ TAG=$1
|
||||
ARCH=$2
|
||||
TARGET_DIR=$3
|
||||
|
||||
GOLANG_VERSION=${GOLANG_VERSION:-1.5.3}
|
||||
GOLANG_VERSION=${GOLANG_VERSION:-1.6.0}
|
||||
GOARM=6
|
||||
|
||||
# Create the ${TARGET_DIR} directory, if it doesn't exist
|
||||
|
@@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
FROM golang:1.4.3
|
||||
FROM golang:1.6.0
|
||||
MAINTAINER Mesosphere <support@mesosphere.io>
|
||||
|
||||
# docker.io is suppossed to be in backports, but it's not there yet.
|
||||
|
Reference in New Issue
Block a user