rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-08 04:18:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #441 from imikushin/dind5

Browse Source 
really fix the rancher/dind:v0.5.0 regression
This commit is contained in:
Ivan Mikushin 2015-07-15 12:12:37 +05:00
commit 9f935fc83d
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/bootstrap
View File

@ -7,11 +7,5 @@ cd $(dirname $0)/..
apt-get update apt-get update
apt-get install -y curl rsync build-essential syslinux xorriso libblkid-dev libmount-dev libselinux1-dev apt-get install -y curl rsync build-essential syslinux xorriso libblkid-dev libmount-dev libselinux1-dev
if [ ! -d /usr/local/go ]; then
GO_VERSION=1.4.2
curl -sSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/local -xz
cd /usr/local/go/src && ./make.bash --no-clean 2>&1
PATH=/usr/local/go/bin:${PATH}
go clean -i net go clean -i net
go install -tags netgo std go install -tags netgo std
fi

2
scripts/ci
View File

@ -4,7 +4,7 @@ set -ex
cd $(dirname $0)/.. cd $(dirname $0)/..
export DOCKER_IMAGE=${DOCKER_IMAGE:=rancher-os-build} export DOCKER_IMAGE=${DOCKER_IMAGE:=rancher-os-build}
export DOCKER_BASE=rancher/dind:v0.1.0 export DOCKER_BASE=rancher/dind:v0.5.0
source scripts/build-common source scripts/build-common
mkdir -p ${BUILD} mkdir -p ${BUILD}