Permalink
Browse files

fix makefiles

  • Loading branch information...
1 parent d700342 commit 1f20a30d28908eab4bb6b4bb35819f35a767471e @anaderi anaderi committed Apr 6, 2017
Showing with 5 additions and 4 deletions.
  1. +2 −2 Makefile
  2. +3 −2 run.makefile
View
@@ -53,8 +53,8 @@ install: ## install everware
if [ ! -f env.sh ] ; then cp env.sh.orig env.sh ; fi
-ogs: ${LOG} ## watch log file
- tail -f ${LOG}
+docker-build: ## build docker image
+ docker build --no-cache -t everware/everware:0.10.0 .
test: ## run all tests
export UPLOADDIR=${UPLOADDIR}; \
View
@@ -21,9 +21,10 @@ run-dockermachine: clean ## run everware server on MacOS
${EXECUTOR} -f etc/local_dockermachine_config.py --no-ssl 2>&1 | tee ${LOG}
run-daemon: clean ## run everware in daemon mode, linux only, SSL required
+ [ -f ${LOG} ] && mv ${LOG} ${LOG}.`date +%Y%m%d-%s`
source ./env.sh && \
- ${EXECUTOR} -f etc/local_config.py >> ${LOG} 2>&1 &
- pgrep ${EXECUTOR} > ${PIDFILE} || ( tail ${LOG} && exit 1 )
+ ${EXECUTOR} -f etc/local_config.py --debug --no-ssl >> ${LOG} 2>&1 &
+ pgrep ${EXECUTOR} > ${PIDFILE} || ( tail ${LOG} && rm ${PIDFILE} && exit 1 )
echo "Started. Log saved to ${LOG}"
stop:

0 comments on commit 1f20a30

Please sign in to comment.