rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-10 02:58:15 +00:00
Code Issues Releases Wiki Activity

Merge pull request #439 from imikushin/cleanup

Browse Source 
scripts cleanup
This commit is contained in:
Ivan Mikushin 2015-07-14 18:43:33 +05:00
commit 6f5cb77045
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -1,3 +1,4 @@
.DS_Store
.git .git
.idea .idea
tmp tmp

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
.DS_Store
/assets /assets
/state /state
/bin /bin

3
scripts/build-common
View File

@ -2,11 +2,8 @@
: ${ARTIFACTS:=$(pwd)/assets} : ${ARTIFACTS:=$(pwd)/assets}
: ${BUILD:=$(pwd)/build} : ${BUILD:=$(pwd)/build}
: ${CONFIG:=$(pwd)/config}
: ${DIST:=$(pwd)/dist} : ${DIST:=$(pwd)/dist}
DOCKER_FILE=${CONFIG}/.dockerfile
write_base() write_base()
{ {
DOCKER_BASE=${DOCKER_BASE:?"DOCKER_BASE not defined"} DOCKER_BASE=${DOCKER_BASE:?"DOCKER_BASE not defined"}

2
scripts/ci
View File

@ -40,7 +40,7 @@ fi
run ./scripts/bootstrap run ./scripts/bootstrap
ARGS= ARGS=
for i in $(ls -d * .* | sort -u | grep -Ev '(\.|\.\.|\.dockerfile|build|tmp|dist|.git|.idea|.vagrant|scripts|bin|state)$'); do for i in $(ls -d * .* | sort -u | grep -Ev '(\.|\.\.|\.dockerfile|build|tmp|dist|.DS_Store|.git|.idea|.vagrant|scripts|bin|state)$'); do
if [ -d $i ]; then if [ -d $i ]; then
run --assets $i run --assets $i
else else