From d837b84241ed01cf42e95c95948224cdbf285e18 Mon Sep 17 00:00:00 2001
From: dvn <git@dvn.me>
Date: Thu, 2 Aug 2018 14:33:18 +0200
Subject: [PATCH] docker: move Dockerfile to root of repo

This is because of a limitation of Docker, which requires that you run
the Dockerfile from the directory in which you will copy in data. Moving
it to the root of the repo allows us to COPY in the code instead of
doing a 'git pull' from the container.
---
 docker/Dockerfile => Dockerfile | 6 +++---
 docker/README.md                | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)
 rename docker/Dockerfile => Dockerfile (94%)

diff --git a/docker/Dockerfile b/Dockerfile
similarity index 94%
rename from docker/Dockerfile
rename to Dockerfile
index c91ce4210..4fdd91f60 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -77,7 +77,7 @@ RUN git clone $GNURL_GIT_URL \
 ENV GNUNET_PREFIX /usr/local/gnunet
 ENV CFLAGS '-g -Wall -O0'
 
-COPY ../ /gnunet
+COPY . /gnunet
 
 RUN cd /gnunet && \
       ./bootstrap && \
@@ -92,8 +92,8 @@ RUN cd /gnunet && \
     rm -fr /gnunet
 
 # Configure GNUnet
-COPY gnunet.conf /etc/gnunet.conf
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
+COPY docker/gnunet.conf /etc/gnunet.conf
+COPY docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod 755 /usr/local/bin/docker-entrypoint
 
 ENV LOCAL_PORT_RANGE='40001 40200'
diff --git a/docker/README.md b/docker/README.md
index 4e0e6b951..ce05012fc 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -7,6 +7,14 @@ A Dockerfile (and maybe later docker-compose.yml) for getting a running GNUnet d
 ## Build it
 This will take quite a while and will consume a bit of data.
 
+First you need to go to the root of this repo.
+
+```bash
+cd ..
+```
+
+Now you can build the image.
+
 ```bash
 docker build -t gnunet .
 ```
-- 
2.25.1