Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OERu
wenotes-docker
Commits
3a09b7ef
Commit
3a09b7ef
authored
Aug 08, 2017
by
Dave Lane
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix run script paths for Faye
parent
b2627591
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
10 deletions
+13
-10
docker-faye/Dockerfile
docker-faye/Dockerfile
+1
-1
docker-faye/conf/run.sh
docker-faye/conf/run.sh
+12
-9
No files found.
docker-faye/Dockerfile
View file @
3a09b7ef
...
...
@@ -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.
...
...
docker-faye/conf/run.sh
View file @
3a09b7ef
...
...
@@ -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
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment