Merged
Conversation
Member
Author
|
(FYI, |
Member
|
LGTM |
Member
|
Scratch that "LGTM", can you bump to the rc1? |
Member
Author
|
YESSS |
This includes support for both `android/arm` and `nacl/arm`. :)
Member
Author
|
Updated! |
Member
|
Ok, you can have the LGTM. 😉 |
|
let me diff w/ 1.3 to review :) |
diff -Nru 1.3/cross/Dockerfile 1.4/cross/Dockerfile
--- 1.3/cross/Dockerfile 2014-11-17 11:04:33.664135988 -0800
+++ 1.4/cross/Dockerfile 2014-11-17 11:07:38.094481403 -0800
@@ -1,31 +1,31 @@
-FROM golang:1.3.3
+FROM golang:1.4rc1
# see https://golang.org/doc/install/source#environment
# see also http://build.golang.org/
-# and canonically, see defs_OS_ARCH.h files in src/pkg/runtime
-# https://code.google.com/p/go/source/browse?name=go1.3#hg%2Fsrc%2Fpkg%2Fruntime
+# and canonically, see defs_OS_ARCH.h files in src/runtime
+# https://code.google.com/p/go/source/browse?name=go1.4beta1#hg%2Fsrc%2Fruntime
ENV GOLANG_CROSSPLATFORMS \
+ android/arm \
darwin/386 darwin/amd64 \
dragonfly/386 dragonfly/amd64 \
freebsd/386 freebsd/amd64 freebsd/arm \
linux/386 linux/amd64 linux/arm \
- nacl/386 nacl/amd64p32 \
+ nacl/386 nacl/amd64p32 nacl/arm \
netbsd/386 netbsd/amd64 netbsd/arm \
openbsd/386 openbsd/amd64 \
plan9/386 plan9/amd64 \
solaris/amd64 \
windows/386 windows/amd64
-# ls src/pkg/runtime/defs_*_*.h | sed -r 's!^.*/defs_([^_]+)_([^_]+)[.]h$!\1/\2!'
+# ls src/runtime/defs_*_*.h | sed -r 's!^.*/defs_([^_]+)_([^_]+)[.]h$!\1/\2!'
# (set an explicit GOARM of 5 for maximum ARM compatibility)
ENV GOARM 5
-RUN bash -xec '\
- cd /usr/src/go/src; \
- for platform in $GOLANG_CROSSPLATFORMS; do \
- GOOS=${platform%/*} \
- GOARCH=${platform##*/} \
- ./make.bash --no-clean 2>&1; \
- done \
- '
+RUN cd /usr/src/go/src \
+ && set -ex \
+ && for platform in $GOLANG_CROSSPLATFORMS; do \
+ GOOS=${platform%/*} \
+ GOARCH=${platform##*/} \
+ ./make.bash --no-clean 2>&1; \
+ done
diff -Nru 1.3/Dockerfile 1.4/Dockerfile
--- 1.3/Dockerfile 2014-11-17 11:04:33.664135988 -0800
+++ 1.4/Dockerfile 2014-11-17 11:07:38.094481403 -0800
@@ -7,7 +7,7 @@
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
-ENV GOLANG_VERSION 1.3.3
+ENV GOLANG_VERSION 1.4rc1
RUN curl -sSL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
| tar -v -C /usr/src -xz
diff -Nru 1.3/onbuild/Dockerfile 1.4/onbuild/Dockerfile
--- 1.3/onbuild/Dockerfile 2014-11-17 11:04:33.664135988 -0800
+++ 1.4/onbuild/Dockerfile 2014-11-17 11:07:38.094481403 -0800
@@ -1,4 +1,4 @@
-FROM golang:1.3.3
+FROM golang:1.4rc1
RUN mkdir -p /go/src/app
WORKDIR /go/src/app
diff -Nru 1.3/wheezy/Dockerfile 1.4/wheezy/Dockerfile
--- 1.3/wheezy/Dockerfile 2014-11-17 11:04:33.664135988 -0800
+++ 1.4/wheezy/Dockerfile 2014-11-17 11:07:38.094481403 -0800
@@ -7,7 +7,7 @@
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
-ENV GOLANG_VERSION 1.3.3
+ENV GOLANG_VERSION 1.4rc1
RUN curl -sSL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
| tar -v -C /usr/src -xz |
|
LGTM |
Member
Author
|
Pretty diff! I think we'll make a habit of that one. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This includes support for both
android/armandnacl/arm. :)