diff options
author | dvn <git@dvn.me> | 2018-08-02 14:33:18 +0200 |
---|---|---|
committer | dvn <git@dvn.me> | 2018-08-02 14:33:18 +0200 |
commit | d837b84241ed01cf42e95c95948224cdbf285e18 (patch) | |
tree | 94878bbae183f0298216a4d46f123fe4a2e65802 | |
parent | dfe12347d2c359f77d2ca732bf7aa7cb0239922e (diff) | |
download | gnunet-d837b84241ed01cf42e95c95948224cdbf285e18.tar.gz gnunet-d837b84241ed01cf42e95c95948224cdbf285e18.zip |
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.
-rw-r--r-- | Dockerfile (renamed from docker/Dockerfile) | 6 | ||||
-rw-r--r-- | docker/README.md | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/docker/Dockerfile b/Dockerfile index c91ce4210..4fdd91f60 100644 --- a/docker/Dockerfile +++ b/Dockerfile | |||
@@ -77,7 +77,7 @@ RUN git clone $GNURL_GIT_URL \ | |||
77 | ENV GNUNET_PREFIX /usr/local/gnunet | 77 | ENV GNUNET_PREFIX /usr/local/gnunet |
78 | ENV CFLAGS '-g -Wall -O0' | 78 | ENV CFLAGS '-g -Wall -O0' |
79 | 79 | ||
80 | COPY ../ /gnunet | 80 | COPY . /gnunet |
81 | 81 | ||
82 | RUN cd /gnunet && \ | 82 | RUN cd /gnunet && \ |
83 | ./bootstrap && \ | 83 | ./bootstrap && \ |
@@ -92,8 +92,8 @@ RUN cd /gnunet && \ | |||
92 | rm -fr /gnunet | 92 | rm -fr /gnunet |
93 | 93 | ||
94 | # Configure GNUnet | 94 | # Configure GNUnet |
95 | COPY gnunet.conf /etc/gnunet.conf | 95 | COPY docker/gnunet.conf /etc/gnunet.conf |
96 | COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint | 96 | COPY docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint |
97 | RUN chmod 755 /usr/local/bin/docker-entrypoint | 97 | RUN chmod 755 /usr/local/bin/docker-entrypoint |
98 | 98 | ||
99 | ENV LOCAL_PORT_RANGE='40001 40200' | 99 | 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 | |||
7 | ## Build it | 7 | ## Build it |
8 | This will take quite a while and will consume a bit of data. | 8 | This will take quite a while and will consume a bit of data. |
9 | 9 | ||
10 | First you need to go to the root of this repo. | ||
11 | |||
12 | ```bash | ||
13 | cd .. | ||
14 | ``` | ||
15 | |||
16 | Now you can build the image. | ||
17 | |||
10 | ```bash | 18 | ```bash |
11 | docker build -t gnunet . | 19 | docker build -t gnunet . |
12 | ``` | 20 | ``` |