From 51d2dddfa8296707a7a70b6ace3931b2982ebfe0 Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Tue, 14 Jul 2015 18:37:39 +0500
Subject: [PATCH] scripts cleanup

---
 .dockerignore        | 1 +
 .gitignore           | 1 +
 scripts/build-common | 3 ---
 scripts/ci           | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 1ecdf2fa..bf99dfab 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
+.DS_Store
 .git
 .idea
 tmp
diff --git a/.gitignore b/.gitignore
index f5581224..36d864f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 /assets
 /state
 /bin
diff --git a/scripts/build-common b/scripts/build-common
index 937045ea..d2a85731 100644
--- a/scripts/build-common
+++ b/scripts/build-common
@@ -2,11 +2,8 @@
 
 : ${ARTIFACTS:=$(pwd)/assets}
 : ${BUILD:=$(pwd)/build}
-: ${CONFIG:=$(pwd)/config}
 : ${DIST:=$(pwd)/dist}
 
-DOCKER_FILE=${CONFIG}/.dockerfile
-
 write_base()
 {
     DOCKER_BASE=${DOCKER_BASE:?"DOCKER_BASE not defined"}
diff --git a/scripts/ci b/scripts/ci
index 4c9dad40..043ee5f3 100755
--- a/scripts/ci
+++ b/scripts/ci
@@ -40,7 +40,7 @@ fi
 
 run ./scripts/bootstrap
 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
         run --assets $i
     else