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 #432 from imikushin/bump-dind

Browse Source 
build scripts: update to rancher/dind:v0.5.0
This commit is contained in:
Ivan Mikushin 2015-07-09 11:47:52 +05:00
commit e7ce1d143f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -5,8 +5,6 @@ cd $(dirname $0)
export DOCKER_IMAGE=rancher-os-build export DOCKER_IMAGE=rancher-os-build
source ./scripts/version
./scripts/ci ./scripts/ci
rm -rf dist rm -rf dist

2
scripts/build
View File

@ -20,7 +20,7 @@ done
if [ "$IN_DOCKER" != "true" ]; then if [ "$IN_DOCKER" != "true" ]; then
cat > .dockerfile << "EOF" cat > .dockerfile << "EOF"
FROM rancher/dind:v0.1.0 FROM rancher/dind:v0.5.0
COPY ./scripts/bootstrap /scripts/bootstrap COPY ./scripts/bootstrap /scripts/bootstrap
RUN /scripts/bootstrap RUN /scripts/bootstrap
WORKDIR /source WORKDIR /source

4
scripts/build-common
View File

@ -9,6 +9,8 @@ DOCKER_FILE=${CONFIG}/.dockerfile
write_base() write_base()
{ {
DOCKER_BASE=${DOCKER_BASE:?"DOCKER_BASE not defined"}
if [ "${BASE_WRITTEN}" = "true" ]; then if [ "${BASE_WRITTEN}" = "true" ]; then
return return
fi fi
@ -16,7 +18,7 @@ write_base()
mkdir -p $(dirname ${DOCKER_FILE}) mkdir -p $(dirname ${DOCKER_FILE})
cat > ${DOCKER_FILE} << EOF cat > ${DOCKER_FILE} << EOF
FROM ${DOCKER_BASE:=ubuntu:14.04.2} FROM ${DOCKER_BASE}
ENV TERM xterm ENV TERM xterm
ENV IN_DOCKER true ENV IN_DOCKER true
WORKDIR /source WORKDIR /source

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}