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

cleanup build a little

Browse Source
This commit is contained in:
Ivan Mikushin
2015-07-09 00:20:16 +05:00
parent a8fcbb7aad
commit 26f470543d
2 changed files with 3 additions and 3 deletions
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

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