group build files into folder INSTALL

Change-Id: Ib76d53f9ff0aed21f12ebd7aac66c1e877bea4a5
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>

15 files changed, 8 insertions, 8 deletions

diff --git a/Dockerfile b/Dockerfile
index dd7da0e..852dc7e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:8
 
-COPY . /root/INSTALL
-RUN /root/INSTALL/docker/setup_image.sh
+COPY INSTALL /root/INSTALL
+RUN /root/INSTALL/setup_image.sh
 
 ENTRYPOINT ["/usr/bin/wait_for_net.sh"]
 CMD ["/bin/systemd"]
diff --git a/config/bashrc b/INSTALL/config/bashrc
index 27da492..27da492 100644
--- a/config/bashrc
+++ b/INSTALL/config/bashrc
diff --git a/docker/firstrun.sh b/INSTALL/firstrun.sh
index 2b70a92..2b70a92 100644
--- a/docker/firstrun.sh
+++ b/INSTALL/firstrun.sh
diff --git a/docker/image.conf b/INSTALL/image.conf
index 27e173f..27e173f 100644
--- a/docker/image.conf
+++ b/INSTALL/image.conf
diff --git a/setup.d/10_base b/INSTALL/setup.d/10_base
index 59dab07..59dab07 100644
--- a/setup.d/10_base
+++ b/INSTALL/setup.d/10_base
diff --git a/setup.d/20_worker_base b/INSTALL/setup.d/20_worker_base
index eef5639..eef5639 100644
--- a/setup.d/20_worker_base
+++ b/INSTALL/setup.d/20_worker_base
diff --git a/setup.d/30_tools b/INSTALL/setup.d/30_tools
index 486daba..486daba 100755
--- a/setup.d/30_tools
+++ b/INSTALL/setup.d/30_tools
diff --git a/setup.d/99_cleanup b/INSTALL/setup.d/99_cleanup
index 3cea352..3cea352 100644
--- a/setup.d/99_cleanup
+++ b/INSTALL/setup.d/99_cleanup
diff --git a/docker/setup_image.sh b/INSTALL/setup_image.sh
index 56cdc1d..00a0a50 100755
--- a/docker/setup_image.sh
+++ b/INSTALL/setup_image.sh
@@ -21,26 +21,26 @@ function debug() {
 trap debug ERR # on error, run a sleep tp debug container
 
 # get the INSTALL dir (the one where we were launched)
-INSTDIR=$(cd $(dirname $0)/.. && pwd -P)
+INSTDIR=$(cd $(dirname $0) && pwd -P)
 echo "Detected container install dir = $INSTDIR"
 
 ################################## variables #################################
 
 # source variables in conf file
-. $INSTDIR/docker/image.conf
+. $INSTDIR/image.conf
 
 ################################## install docker endpoint #####################
 
 # install the entrypoint script in /usr/bin
-install --mode=755 $INSTDIR/docker/wait_for_net.sh /usr/bin/
+install --mode=755 $INSTDIR/wait_for_net.sh /usr/bin/
 
 ################################## install first-run service ###################
 # all operations requiring runnning daemons (inc. systemd) must be run at first
 # container instanciation
 
 if [[ "$FIRSTRUN" == "yes" ]]; then
-	install --mode=755 $INSTDIR/docker/firstrun.sh      /root/firstrun.sh
-	install --mode=644 $INSTDIR/docker/image.conf       /root/firstrun.conf
+	install --mode=755 $INSTDIR/firstrun.sh      /root/firstrun.sh
+	install --mode=644 $INSTDIR/image.conf       /root/firstrun.conf
 	[[ -d $INSTDIR/firstrun.d ]] && cp -a $INSTDIR/firstrun.d /root/
 	mkdir -p /etc/systemd/system/multi-user.target.wants/
 	cat <<EOF >/etc/systemd/system/multi-user.target.wants/firstrun.service
diff --git a/tools/bmaptools/bmap-tools_3.3_all.deb b/INSTALL/tools/bmaptools/bmap-tools_3.3_all.deb
index 115aa44..115aa44 100644
--- a/tools/bmaptools/bmap-tools_3.3_all.deb
+++ b/INSTALL/tools/bmaptools/bmap-tools_3.3_all.deb
diff --git a/tools/scripts/install_sdk b/INSTALL/tools/scripts/install_sdk
index 7de6023..7de6023 100644
--- a/tools/scripts/install_sdk
+++ b/INSTALL/tools/scripts/install_sdk
diff --git a/tools/scripts/mksdcard b/INSTALL/tools/scripts/mksdcard
index d93328e..d93328e 100755
--- a/tools/scripts/mksdcard
+++ b/INSTALL/tools/scripts/mksdcard
diff --git a/tools/scripts/run_xnbd_server b/INSTALL/tools/scripts/run_xnbd_server
index 190301d..190301d 100755
--- a/tools/scripts/run_xnbd_server
+++ b/INSTALL/tools/scripts/run_xnbd_server
diff --git a/docker/wait_for_net.sh b/INSTALL/wait_for_net.sh
index 354e76a..354e76a 100755
--- a/docker/wait_for_net.sh
+++ b/INSTALL/wait_for_net.sh
diff --git a/README.md b/README.md
index 7df5102..4c2659b 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ The Dockerfile is generic: it simply inherits from a Debian image.
 When running a 'docker build':
 
 * Docker instantiates a new container based on the latest Debian image
-* Docker copies the current directory inside the container in /root/INSTALL
+* Docker copies the INSTALL folder inside the container in /root/INSTALL
 * then it runs the setup script /root/INSTALL/docker/setup_image.sh
 
 In turn, this setup script will: