status-im
/
xgo
mirror of https://github.com/status-im/xgo.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update base image to Ubuntu 15.10.

This commit is contained in:
Péter Szilágyi 2015-11-03 12:35:56 +02:00
parent f2621776c8
commit 666ff21c54
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker/base/Dockerfile
View File

@ -3,7 +3,7 @@
# #
# Released under the MIT license. # Released under the MIT license.
FROM ubuntu:14.04 FROM ubuntu:15.10
MAINTAINER Péter Szilágyi <peterke@gmail.com> MAINTAINER Péter Szilágyi <peterke@gmail.com>
@ -21,15 +21,16 @@ RUN chmod +x $FETCH
# Make sure apt-get is up to date and dependent packages are installed # Make sure apt-get is up to date and dependent packages are installed
RUN \ RUN \
apt-get update && \ apt-get update && \
apt-get install -y automake autogen build-essential ca-certificates \ apt-get install -y automake autogen build-essential ca-certificates \
gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libc6-dev-armel-cross \ gcc-5-arm-linux-gnueabi g++-5-arm-linux-gnueabi libc6-dev-armel-cross \
gcc-multilib g++-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \ gcc-5-multilib g++-5-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \
libtool libxml2-dev uuid-dev libssl-dev pkg-config patch make xz-utils \ libtool libxml2-dev uuid-dev libssl-dev pkg-config patch make xz-utils \
cpio wget unzip p7zip git mercurial bzr --no-install-recommends cpio wget unzip p7zip git mercurial bzr --no-install-recommends && \
ln -s /usr/include/asm-generic /usr/include/asm
# Configure the container for OSX cross compilation # Configure the container for OSX cross compilation
ENV OSX_SDK_PATH https://github.com/trevd/android_platform_build2/raw/master/osxsdks10.6.tar.gz ENV OSX_SDK_PATH https://github.com/trevd/android_platform_build2/raw/master/osxsdks10.6.tar.gz
ENV OSX_SDK MacOSX10.6.sdk ENV OSX_SDK MacOSX10.6.sdk
RUN \ RUN \
git clone https://github.com/tpoechtrager/osxcross.git && \ git clone https://github.com/tpoechtrager/osxcross.git && \
@ -39,7 +40,7 @@ RUN \
tar -cjf /osxcross/tarballs/$OSX_SDK.tar.bz2 $OSX_SDK && \ tar -cjf /osxcross/tarballs/$OSX_SDK.tar.bz2 $OSX_SDK && \
rm -rf `basename $OSX_SDK_PATH` $OSX_SDK && \ rm -rf `basename $OSX_SDK_PATH` $OSX_SDK && \
\ \
UNATTENDED=yes /osxcross/build.sh UNATTENDED=yes OSX_VERSION_MIN=10.6 /osxcross/build.sh
ENV PATH /osxcross/target/bin:$PATH ENV PATH /osxcross/target/bin:$PATH

2
docker/base/bootstrap_pure.sh
View File

@ -26,7 +26,7 @@ echo "Bootstrapping linux/386..."
GOOS=linux GOARCH=386 CGO_ENABLED=1 go install std GOOS=linux GOARCH=386 CGO_ENABLED=1 go install std
echo "Bootstrapping linux/arm..." echo "Bootstrapping linux/arm..."
GOOS=linux GOARCH=arm CGO_ENABLED=1 CC=arm-linux-gnueabi-gcc go install std GOOS=linux GOARCH=arm CGO_ENABLED=1 CC=arm-linux-gnueabi-gcc-5 go install std
echo "Bootstrapping windows/amd64..." echo "Bootstrapping windows/amd64..."
GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc go install std GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc go install std

6
docker/base/build.sh
View File

@ -161,9 +161,9 @@ for TARGET in $TARGETS; do
fi fi
if ([ $XGOOS == "." ] || [ $XGOOS == "linux" ]) && ([ $XGOARCH == "." ] || [ $XGOARCH == "arm" ]); then if ([ $XGOOS == "." ] || [ $XGOOS == "linux" ]) && ([ $XGOARCH == "." ] || [ $XGOARCH == "arm" ]); then
echo "Compiling for linux/arm..." echo "Compiling for linux/arm..."
CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnueabi-g++ HOST=arm-linux PREFIX=/usr/local/arm $BUILD_DEPS /deps CC=arm-linux-gnueabi-gcc-5 CXX=arm-linux-gnueabi-g++-5 HOST=arm-linux PREFIX=/usr/local/arm $BUILD_DEPS /deps
CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnueabi-g++ GOOS=linux GOARCH=arm CGO_ENABLED=1 GOARM=5 go get $V $X "${T[@]}" --ldflags="$LD" -d ./$PACK CC=arm-linux-gnueabi-gcc-5 CXX=arm-linux-gnueabi-g++-5 GOOS=linux GOARCH=arm CGO_ENABLED=1 GOARM=5 go get $V $X "${T[@]}" --ldflags="$LD" -d ./$PACK
CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnueabi-g++ GOOS=linux GOARCH=arm CGO_ENABLED=1 GOARM=5 go build $V $X "${T[@]}" --ldflags="$LD" -o /build/$NAME-linux-arm ./$PACK CC=arm-linux-gnueabi-gcc-5 CXX=arm-linux-gnueabi-g++-5 GOOS=linux GOARCH=arm CGO_ENABLED=1 GOARM=5 go build $V $X "${T[@]}" --ldflags="$LD" -o /build/$NAME-linux-arm ./$PACK
fi fi
# Check and build for Windows targets # Check and build for Windows targets
if ([ $XGOOS == "." ] || [ $XGOOS == "windows" ]) && ([ $XGOARCH == "." ] || [ $XGOARCH == "amd64" ]); then if ([ $XGOOS == "." ] || [ $XGOOS == "windows" ]) && ([ $XGOARCH == "." ] || [ $XGOARCH == "amd64" ]); then