Skip to content

Add 1.4beta1 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2014
Merged

Add 1.4beta1 #26

merged 1 commit into from
Nov 17, 2014

Conversation

tianon
Copy link
Member

@tianon tianon commented Nov 15, 2014

This includes support for both android/arm and nacl/arm. :)

@tianon
Copy link
Member Author

tianon commented Nov 15, 2014

(FYI, 1.4/cross/Dockerfile includes #25. 👍)

@yosifkit
Copy link
Member

LGTM

@yosifkit
Copy link
Member

Scratch that "LGTM", can you bump to the rc1?

@tianon
Copy link
Member Author

tianon commented Nov 17, 2014

YESSS

This includes support for both `android/arm` and `nacl/arm`. :)
@tianon
Copy link
Member Author

tianon commented Nov 17, 2014

Updated!

@yosifkit
Copy link
Member

Ok, you can have the LGTM. 😉

@proppy
Copy link

proppy commented Nov 17, 2014

let me diff w/ 1.3 to review :)

@proppy
Copy link

proppy commented Nov 17, 2014

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

@proppy
Copy link

proppy commented Nov 17, 2014

LGTM

tianon added a commit that referenced this pull request Nov 17, 2014
@tianon tianon merged commit 281dec1 into docker-library:master Nov 17, 2014
@tianon tianon deleted the 1.4 branch November 17, 2014 20:00
@tianon
Copy link
Member Author

tianon commented Nov 17, 2014

Pretty diff! I think we'll make a habit of that one.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants