diff options
| -rw-r--r-- | catlfish-dev/Dockerfile | 5 | ||||
| -rwxr-xr-x | catlfish-dev/start.sh | 5 |
2 files changed, 2 insertions, 8 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 diff --git a/catlfish-dev/start.sh b/catlfish-dev/start.sh index 8b3d04a..86a09e5 100755 --- a/catlfish-dev/start.sh +++ b/catlfish-dev/start.sh @@ -11,10 +11,7 @@ erlbase=$ERLANG_BASE_DIR # Use some reasonable default values. [ -z "$erlbase" ] && erlbase=/usr/local/catlfish -# FIXME: Get getconfig.sh from the -# $erlbase/lib/catlfish-$VERSION.ez (zip archive) instead of requiring -# source code to be unpacked in the container. -GETCONFIG=/usr/local/catlfish/src/tools/getconfig.sh +GETCONFIG=/usr/local/catlfish/tools/getconfig.sh mkdir ${nodename} $GETCONFIG /usr/local/etc/catlfish/${nodename}.cfg ${logname}.cfg force-compile |