x/bansho
Code Issues Proposed changes

Got rid of supervisord

Browse Source
This commit is contained in:
aviau 2015-04-20 17:33:34 -04:00
parent 4aaca6addc
commit d9c6684618
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -7,13 +7,10 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
RUN apt-get update && apt-get install -yq git apache2 npm nodejs-legacy supervisor ruby RUN apt-get update && apt-get install -yq git apache2 npm nodejs-legacy ruby
RUN npm install -g grunt-cli bower RUN npm install -g grunt-cli bower
RUN gem install sass RUN gem install sass
RUN mkdir -p /var/lock/apache2 /var/run/apache2 /var/run/sshd /var/log/supervisor RUN mkdir -p /var/lock/apache2 /var/run/apache2 /var/run/sshd
# Add supervisor config files
COPY container/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
# Configure Apache2 for reverse-proxying # Configure Apache2 for reverse-proxying
ADD container/000-default.conf etc/apache2/sites-enabled/000-default.conf ADD container/000-default.conf etc/apache2/sites-enabled/000-default.conf
@ -33,4 +30,5 @@ RUN a2enmod proxy_http
# Expose appropriate ports # Expose appropriate ports
EXPOSE 8080 EXPOSE 8080
CMD ["/usr/bin/supervisord"] CMD ((cd /opt/adagios-frontend && grunt sass && grunt uglify && grunt) &) && \
bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"

9
container/supervisord.conf
View File

@ -1,9 +0,0 @@
[supervisord]
nodaemon=true
[program:apache2]
command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"
[program:grunt]
command=/bin/bash -c "cd /opt/adagios-frontend && grunt sass && grunt uglify && grunt"