summaryrefslogtreecommitdiff
path: root/catlfish-dev/Dockerfile
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-09-06 18:40:49 +0200
committerLinus Nordberg <linus@nordu.net>2017-09-06 18:40:49 +0200
commit40bc8c41cc73d58ad975d7bf218fcb698e944094 (patch)
tree31c84c0fcf32c727f6c0ee69b3b551728ae3f649 /catlfish-dev/Dockerfile
parent87f696f141d616b87b0c8078bfd0cfcdb2ff2601 (diff)
Make 'install' too, which installs tools directory.
Stop moving the source dir to INSTDIR -- make install does what's needed. Use getconfig.sh in INSTDIR/tools/.
Diffstat (limited to 'catlfish-dev/Dockerfile')
-rw-r--r--catlfish-dev/Dockerfile5
1 files changed, 1 insertions, 4 deletions
diff --git a/catlfish-dev/Dockerfile b/catlfish-dev/Dockerfile
index c07fd4e..421ba72 100644
--- a/catlfish-dev/Dockerfile
+++ b/catlfish-dev/Dockerfile
@@ -66,10 +66,7 @@ RUN make -C plop
WORKDIR /usr/local/src
RUN git clone https://git.nordu.net/catlfish.git
-RUN make -C catlfish PREFIX=/usr/local all release
-# Move source dir into installation dir, to make $CWD/../lib/ make
-# sense for escripts.
-RUN mv /usr/local/src/catlfish /usr/local/catlfish/src
+RUN make -C catlfish PREFIX=/usr/local all release install
# Config dir is mounted from host using `-v' to 'docker run'.
VOLUME /usr/local/etc/catlfish