From 07ac4d2207bf584ec08e39d6a7ca455ad2485a2b Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Fri, 9 Mar 2018 14:23:08 +0100
Subject: [PATCH] fix: move Dockerfile to project root (#1628)

Docker's build process doesn't allow you to ADD or COPY files from outside the directory tree. e.g. `ADD ../package.json .` is forbidden. The only option I can see is to move it and `hooks` back into the project root.
---
 .dockerignore                     | 4 ++++
 docker/Dockerfile => Dockerfile   | 0
 {docker/hooks => hooks}/post_push | 0
 {docker/hooks => hooks}/readme.md | 0
 4 files changed, 4 insertions(+)
 create mode 100644 .dockerignore
 rename docker/Dockerfile => Dockerfile (100%)
 rename {docker/hooks => hooks}/post_push (100%)
 rename {docker/hooks => hooks}/readme.md (100%)

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..d152c3c742
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+*
+!package.json
+!yarn.lock
+!lib
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to Dockerfile
diff --git a/docker/hooks/post_push b/hooks/post_push
similarity index 100%
rename from docker/hooks/post_push
rename to hooks/post_push
diff --git a/docker/hooks/readme.md b/hooks/readme.md
similarity index 100%
rename from docker/hooks/readme.md
rename to hooks/readme.md
-- 
GitLab