Commit 3a09b7ef authored by Dave Lane's avatar Dave Lane

fix run script paths for Faye

parent b2627591
......@@ -98,7 +98,7 @@ RUN chmod u+x /root/conf/*.sh
# expose relevant ports
EXPOSE 80
VOLUME ["/opt/wenotes/server", "/opt/wenotes/server/options.json"]
VOLUME ["/opt/wenotes", "/opt/wenotes/options.json"]
# First, say we're doing it
RUN echo "running run.sh - /root/conf/run.sh"
# Actually do it when we run the container.
......
......@@ -53,17 +53,20 @@ if [ "$1" = 'faye' ]; then
if [[ -f $CONF/faye.yml ]] ; then
echo "moving to server"
if [[ -d $WENOTES/server ]] ; then
cd $WENOTES/server
echo "installing Node.JS dependencies"
$NPM install
# this will be provided on the local filesystem, linked via a volume...
# $CP $CONF/options.json options.json
echo "starting pm2 to supervise scripts in $WENOTES/server/conf/faye.yml"
$PM2 start --no-daemon conf/faye.yml
#$PM2 start $CONF/faye.yml
cd $WENOTES
cd $WENOTES/server
echo "copying configuration..."
cp -a $CONF .
echo "installing Node.JS dependencies"
$NPM install
# this will be provided on the local filesystem, linked via a volume...
# $CP $CONF/options.json options.json
echo "starting pm2 to supervise scripts in $WENOTES/server/conf/faye.yml"
$PM2 start --no-daemon conf/faye.yml
#$PM2 start $CONF/faye.yml
cd $WENOTES
else
echo "***looks like clone of wenotes-server failed - it's not in $WENOTES/server..."
fi
fi
echo "returning to original dir: $CWD"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment