From: Brian Warner Date: Sun, 7 Jun 2015 21:30:58 +0000 (-0700) Subject: move Dockerfile back to root. DockerHub can't handle it elsewhere. X-Git-Tag: allmydata-tahoe-1.10.1b1~6 X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/%22file:?a=commitdiff_plain;h=cf9b38286375c3c1961c244fd4a7941bb7727d70;p=tahoe-lafs%2Ftahoe-lafs.git move Dockerfile back to root. DockerHub can't handle it elsewhere. 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. --- diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..6b45619b --- /dev/null +++ b/Dockerfile @@ -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 index 155ed846..00000000 --- a/misc/build_helpers/Dockerfile +++ /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