From 2bb55e4ad7fe19905142babb26f5dc76ae06354f Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 15 Oct 2019 13:46:20 -0400 Subject: [PATCH] New startup script --- Dockerfile | 3 ++- citadel-docker-startup.sh | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 386e6b6..71bb536 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,8 @@ RUN sh -c 'cd /tmp/ctdl_build/citadel/libcitadel && ./bootstrap && ./configure - RUN sh -c 'cd /tmp/ctdl_build/citadel/citadel && ./bootstrap && ./configure && make && make install' RUN sh -c 'cd /tmp/ctdl_build/citadel/webcit && ./bootstrap && ./configure && make && make install' RUN sh -c 'cd /tmp/ctdl_build/citadel/textclient && ./bootstrap && ./configure --prefix=/usr && make && make install' -RUN sh -c 'cd / && rm vfr /tmp/ctdl_build' +RUN sh -c 'cd / && rm -vfr /tmp/ctdl_build' +RUN sh -c 'rm -vrf /usr/local/citadel/data /usr/local/citadel/files /usr/local/citadel/keys /usr/local/webcit/keys' # Supervisor ADD supervisor.conf /etc/ diff --git a/citadel-docker-startup.sh b/citadel-docker-startup.sh index 9382ea1..64d6387 100755 --- a/citadel-docker-startup.sh +++ b/citadel-docker-startup.sh @@ -2,10 +2,18 @@ # This is the script that is run when the Citadel Docker Container starts up. + +# Any of these can fail, since they may already exist mkdir /citadel-data -mkdir -p /citadel-data/data && rm -vfr /usr/local/citadel/data && ln -sfv /citadel-data/data /usr/local/citadel/data -mkdir -p /citadel-data/files && rm -vfr /usr/local/citadel/files && ln -sfv /citadel-data/files /usr/local/citadel/files -mkdir -p /citadel-data/keys && rm -vfr /usr/local/citadel/keys && ln -sfv /citadel-data/keys /usr/local/citadel/keys -rmdir -v /usr/local/webcit/keys && ln -sfv /citadel-data/keys /usr/local/webcit/keys +mkdir -p /citadel-data/data +mkdir -p /citadel-data/files +mkdir -p /citadel-data/keys + +# Now create the links +ln -sfv /citadel-data/data /usr/local/citadel/data +ln -sfv /citadel-data/files /usr/local/citadel/files +ln -sfv /citadel-data/keys /usr/local/citadel/keys +ln -sfv /citadel-data/keys /usr/local/webcit/keys +# supervisord will take it from here exec supervisor -- 2.30.2