From e7b07a556f8fde8f8dcda1085c0ef0a5bb45b823 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Thu, 3 Mar 2016 17:03:14 -0800
Subject: [PATCH] build(32-bit): Move a few docker files out of root of repo

---
 {script => build/resources/linux/docker}/dockerbuild         | 0
 {docker => build/resources/linux/docker}/ubuntu32/Dockerfile | 0
 script/{cibuild-n1-ubuntu32 => cibuild-docker-ubuntu32}      | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {script => build/resources/linux/docker}/dockerbuild (100%)
 rename {docker => build/resources/linux/docker}/ubuntu32/Dockerfile (100%)
 rename script/{cibuild-n1-ubuntu32 => cibuild-docker-ubuntu32} (59%)

diff --git a/script/dockerbuild b/build/resources/linux/docker/dockerbuild
similarity index 100%
rename from script/dockerbuild
rename to build/resources/linux/docker/dockerbuild
diff --git a/docker/ubuntu32/Dockerfile b/build/resources/linux/docker/ubuntu32/Dockerfile
similarity index 100%
rename from docker/ubuntu32/Dockerfile
rename to build/resources/linux/docker/ubuntu32/Dockerfile
diff --git a/script/cibuild-n1-ubuntu32 b/script/cibuild-docker-ubuntu32
similarity index 59%
rename from script/cibuild-n1-ubuntu32
rename to script/cibuild-docker-ubuntu32
index 9926c6168..4ff36bdb6 100755
--- a/script/cibuild-n1-ubuntu32
+++ b/script/cibuild-docker-ubuntu32
@@ -3,11 +3,11 @@
 set -e
 
 # --rm \
-docker build -t n1-32 -f ./docker/ubuntu32/Dockerfile .
+docker build -t n1-32 -f ./build/resources/linux/docker/ubuntu32/Dockerfile .
 docker run \
  --env PUBLISH_BUILD="$PUBLISH_BUILD" \
  --env TRAVIS="$TRAVIS" \
  --env TRAVIS_PULL_REQUEST="$TRAVIS_PULL_REQUEST" \
  --env TRAVIS_BRANCH="$TRAVIS_BRANCH" \
- n1-32 /usr/bin/linux32 /n1/script/dockerbuild
+ n1-32 /usr/bin/linux32 /n1/build/resources/linux/docker/dockerbuild
 docker rmi n1-32