x/surveil
Code Issues Proposed changes

Surveil container: don't use supervisor

Browse Source 
Change-Id: I640efc6ee192ad0dbb497b9256d169b796b306f5
This commit is contained in:
aviau 2015-04-15 14:45:21 -04:00
parent a794fec4d3
commit f37d87367a
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -2,7 +2,7 @@ FROM ubuntu:trusty
MAINTAINER Alexandre Viau <alexandre.viau@savoirfairelinux.com> MAINTAINER Alexandre Viau <alexandre.viau@savoirfairelinux.com>
RUN apt-get update && apt-get install -y vim supervisor python-pip python3-pip python-dev libffi-dev libssl-dev git python-pycurl RUN apt-get update && apt-get install -y vim python-pip python3-pip python-dev libffi-dev libssl-dev git python-pycurl
# Surveil needs shinken (as a lib) # Surveil needs shinken (as a lib)
RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/2.2-RC1.zip RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/2.2-RC1.zip
@ -27,13 +27,11 @@ ADD etc/surveil /etc/surveil
# Install # Install
RUN pip install -r /surveil/requirements.txt RUN pip install -r /surveil/requirements.txt
# Supervisor
ADD tools/docker/surveil_container/etc/supervisor /etc/supervisor
# Surveil API # Surveil API
EXPOSE 8080 EXPOSE 8080
CMD sleep 20 && \ CMD cd /surveil/ && \
cd /surveil/ && \
python setup.py develop && \ python setup.py develop && \
/usr/bin/supervisord ((sleep 40 && surveil-init) &) && \
sleep 20 && \
surveil-api --reload

2
docker-compose.yml
View File

@ -18,7 +18,7 @@ shinken:
- "7767:7767" - "7767:7767"
mongo: mongo:
image: mongo image: mongo:2.6
ports: ports:
- "27017:27017" - "27017:27017"

8
tools/docker/surveil_container/etc/supervisor/conf.d/supervisor.conf
View File

@ -1,8 +0,0 @@
[supervisord]
nodaemon=true
[program:surveil]
command=/bin/sh -c "surveil-api --reload"
[program:surveil-init]
command=/bin/sh -c "sleep 10 && surveil-init"