move Dockerfile back to root. DockerHub can't handle it elsewhere.
authorBrian Warner <warner@lothar.com>
Sun, 7 Jun 2015 21:30:58 +0000 (14:30 -0700)
committerBrian Warner <warner@lothar.com>
Sun, 7 Jun 2015 21:30:58 +0000 (14:30 -0700)
It looks like DockerHub's automated builds only have access to the
subtree of the source checkout at+below the Dockerfile. Putting the
Dockerfile in misc/build_helpers/ meant that the build process only had
access to misc/build_helpers/, not the full source tree.

Dockerfile [new file with mode: 0644]
misc/build_helpers/Dockerfile [deleted file]

diff --git a/Dockerfile b/Dockerfile
new file mode 100644 (file)
index 0000000..6b45619
--- /dev/null
@@ -0,0 +1,9 @@
+FROM python:2.7
+
+ADD . /tahoe-lafs
+RUN \
+  cd /tahoe-lafs && \
+  make && \
+  ln -vs /tahoe-lafs/bin/tahoe /usr/local/bin/tahoe
+
+WORKDIR /root
diff --git a/misc/build_helpers/Dockerfile b/misc/build_helpers/Dockerfile
deleted file mode 100644 (file)
index 155ed84..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM python:2.7
-
-ADD ../.. /tahoe-lafs
-RUN \
-  cd /tahoe-lafs && \
-  make && \
-  ln -vs /tahoe-lafs/bin/tahoe /usr/local/bin/tahoe
-
-WORKDIR /root