removed lxml post processing

updated dockerfile
This commit is contained in:
Matthew Scragg 2014-10-29 15:06:54 -05:00
parent 1b1e34b035
commit 325c735f4e
7 changed files with 57 additions and 68 deletions

View file

@ -1,21 +1,15 @@
FROM realms/base
# Packages
RUN add-apt-repository -y ppa:chris-lea/node.js && apt-get update
RUN apt-get install -y python build-essential git libpcre3-dev python-software-properties \
python-pip python-virtualenv python-dev pkg-config curl libxml2-dev libxslt1-dev zlib1g-dev \
libffi-dev nodejs libyaml-dev
RUN apt-get update && apt-get install -y build-essential python-pip python-virtualenv python-dev zlib1g-dev libffi-dev libyaml-dev
# Realms Code
RUN cd /home/deploy && git clone https://github.com/scragg0x/realms-wiki
# lxml deps
# libxml2-dev libxslt1-dev
# Bower stuff for frontend assets
RUN npm install -g bower
RUN bower --allow-root --config.cwd=/home/deploy/realms-wiki --config.directory=realms/static/vendor --config.interactive=false install
# Virtualenv building
# Virtualenv
RUN virtualenv /home/deploy/realms-wiki/.venv
RUN /home/deploy/realms-wiki/.venv/bin/pip install /home/deploy/realms-wiki
RUN cd /home/deploy/realms-wiki && .venv/bin/pip install realms-wiki
# Logging
RUN mkdir /var/log/realms-wiki && chown deploy.deploy /var/log/realms-wiki

View file

@ -1,9 +1,51 @@
#!/bin/sh
#!/bin/bash
limit nofile 65335 65335
respawn
description "Realms Wiki"
author "scragg@gmail.com"
chdir /home/deploy/realms-wiki
env PATH=/home/deploy/realms-wiki/.venv/bin:/usr/local/bin:/usr/bin:/bin:$PATH
export PATH
env LC_ALL=en_US.UTF-8
env GEVENT_RESOLVER=ares
export LC_ALL
export GEVENT_RESOLVER
if [ "${REALMS_WIKI_CONFIG}" != "" ]; then
realms-wiki configure ${REALMS_WIKI_CONFIG}
fi
exec /sbin/setuser deploy /home/deploy/realms-wiki/.venv/bin/python manage.py run >>/var/log/realms-wiki/realms-wiki.log 2>&1
if [ "${REALMS_WIKI_WORKERS}" == "" ]; then
REALMS_WIKI_WORKERS=3
fi
if [ "${REALMS_WIKI_PORT}" == "" ]; then
REALMS_WIKI_PORT=5000
fi
setuid deploy
setgid deploy
start on runlevel [2345]
stop on runlevel [!2345]
respawn
exec gunicorn \
--name realms-wiki \
--access-logfile - \
--error-logfile - \
--worker-class gevent \
--workers ${REALMS_WIKI_WORKERS} \
--bind 0.0.0.0:${REALMS_WIKI_PORT} \
--user deploy \
--group deploy \
--chdir /home/deploy/realms-wiki \
'realms:create_app()' >>/var/log/realms-wiki/realms-wiki.log 2>&1