mirror of
https://github.com/rancher/os.git
synced 2025-09-04 00:04:25 +00:00
cleanup build a little
This commit is contained in:
2
build.sh
2
build.sh
@@ -5,8 +5,6 @@ cd $(dirname $0)
|
||||
|
||||
export DOCKER_IMAGE=rancher-os-build
|
||||
|
||||
source ./scripts/version
|
||||
|
||||
./scripts/ci
|
||||
|
||||
rm -rf dist
|
||||
|
@@ -9,6 +9,8 @@ DOCKER_FILE=${CONFIG}/.dockerfile
|
||||
|
||||
write_base()
|
||||
{
|
||||
DOCKER_BASE=${DOCKER_BASE:?"DOCKER_BASE not defined"}
|
||||
|
||||
if [ "${BASE_WRITTEN}" = "true" ]; then
|
||||
return
|
||||
fi
|
||||
@@ -16,7 +18,7 @@ write_base()
|
||||
mkdir -p $(dirname ${DOCKER_FILE})
|
||||
|
||||
cat > ${DOCKER_FILE} << EOF
|
||||
FROM ${DOCKER_BASE:=ubuntu:14.04.2}
|
||||
FROM ${DOCKER_BASE}
|
||||
ENV TERM xterm
|
||||
ENV IN_DOCKER true
|
||||
WORKDIR /source
|
||||
|
Reference in New Issue
Block a user