From cfe9a2a5c7576a01fdbbadca43760496a9405ece Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Sun, 20 Sep 2015 19:21:21 -0700
Subject: [PATCH] Move docker directory from src/ to top directory.

Currently meta information regarding how to set up build environment
for Mozc and how to build Mozc actually is described in files at the
top level directory (e.g., README.md and appveyor.yml) and documents
under doc/ directory.  One exception of this directory structure is
docker files under src/docker/ directory.

Probably extracting this kind of meta source code out from src/
directory would make sense from the viewpoint of directory structure
management.
---
 doc/build_mozc_in_docker.md                                 | 4 ++--
 {src/docker => docker}/fedora21/Dockerfile                  | 0
 {src/docker => docker}/fedora21/clobber-make-buildenv.sh    | 0
 {src/docker => docker}/fedora21/enter-buildenv.sh           | 0
 {src/docker => docker}/fedora21/make-buildenv.sh            | 0
 {src/docker => docker}/ubuntu14.04/Dockerfile               | 0
 {src/docker => docker}/ubuntu14.04/clobber-make-buildenv.sh | 0
 {src/docker => docker}/ubuntu14.04/enter-buildenv.sh        | 0
 {src/docker => docker}/ubuntu14.04/make-buildenv.sh         | 0
 9 files changed, 2 insertions(+), 2 deletions(-)
 rename {src/docker => docker}/fedora21/Dockerfile (100%)
 rename {src/docker => docker}/fedora21/clobber-make-buildenv.sh (100%)
 rename {src/docker => docker}/fedora21/enter-buildenv.sh (100%)
 rename {src/docker => docker}/fedora21/make-buildenv.sh (100%)
 rename {src/docker => docker}/ubuntu14.04/Dockerfile (100%)
 rename {src/docker => docker}/ubuntu14.04/clobber-make-buildenv.sh (100%)
 rename {src/docker => docker}/ubuntu14.04/enter-buildenv.sh (100%)
 rename {src/docker => docker}/ubuntu14.04/make-buildenv.sh (100%)

diff --git a/doc/build_mozc_in_docker.md b/doc/build_mozc_in_docker.md
index 766852d2d..49faf2de9 100644
--- a/doc/build_mozc_in_docker.md
+++ b/doc/build_mozc_in_docker.md
@@ -11,7 +11,7 @@ Currently, only Ubuntu 14.04 is tested to host the Docker container to build Moz
 
 ```
 mkdir ubuntu14.04 && cd ubuntu14.04
-curl -O https://raw.githubusercontent.com/google/mozc/master/src/docker/ubuntu14.04/Dockerfile
+curl -O https://raw.githubusercontent.com/google/mozc/master/docker/ubuntu14.04/Dockerfile
 sudo docker build --rm -t $USER/mozc_ubuntu14.04 .
 sudo docker run --interactive --tty --rm $USER/mozc_ubuntu14.04
 ```
@@ -21,7 +21,7 @@ Fedora 21 container is also provided just for your reference.
 
 ```
 mkdir fedora21 && cd fedora21
-curl -O https://raw.githubusercontent.com/google/mozc/master/src/docker/fedora21/Dockerfile
+curl -O https://raw.githubusercontent.com/google/mozc/master/docker/fedora21/Dockerfile
 sudo docker build --rm -t $USER/mozc_fedora21 .
 sudo docker run --interactive --tty --rm $USER/mozc_fedora21
 ```
diff --git a/src/docker/fedora21/Dockerfile b/docker/fedora21/Dockerfile
similarity index 100%
rename from src/docker/fedora21/Dockerfile
rename to docker/fedora21/Dockerfile
diff --git a/src/docker/fedora21/clobber-make-buildenv.sh b/docker/fedora21/clobber-make-buildenv.sh
similarity index 100%
rename from src/docker/fedora21/clobber-make-buildenv.sh
rename to docker/fedora21/clobber-make-buildenv.sh
diff --git a/src/docker/fedora21/enter-buildenv.sh b/docker/fedora21/enter-buildenv.sh
similarity index 100%
rename from src/docker/fedora21/enter-buildenv.sh
rename to docker/fedora21/enter-buildenv.sh
diff --git a/src/docker/fedora21/make-buildenv.sh b/docker/fedora21/make-buildenv.sh
similarity index 100%
rename from src/docker/fedora21/make-buildenv.sh
rename to docker/fedora21/make-buildenv.sh
diff --git a/src/docker/ubuntu14.04/Dockerfile b/docker/ubuntu14.04/Dockerfile
similarity index 100%
rename from src/docker/ubuntu14.04/Dockerfile
rename to docker/ubuntu14.04/Dockerfile
diff --git a/src/docker/ubuntu14.04/clobber-make-buildenv.sh b/docker/ubuntu14.04/clobber-make-buildenv.sh
similarity index 100%
rename from src/docker/ubuntu14.04/clobber-make-buildenv.sh
rename to docker/ubuntu14.04/clobber-make-buildenv.sh
diff --git a/src/docker/ubuntu14.04/enter-buildenv.sh b/docker/ubuntu14.04/enter-buildenv.sh
similarity index 100%
rename from src/docker/ubuntu14.04/enter-buildenv.sh
rename to docker/ubuntu14.04/enter-buildenv.sh
diff --git a/src/docker/ubuntu14.04/make-buildenv.sh b/docker/ubuntu14.04/make-buildenv.sh
similarity index 100%
rename from src/docker/ubuntu14.04/make-buildenv.sh
rename to docker/ubuntu14.04/make-buildenv.sh