Commit 3167ac29 authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Using convenstion for supervisord configuration files.

parent 4a558eb1

cog/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -86,9 +86,9 @@ RUN chown -R cogadmin:cogadmin $COG_DIR 
VOLUME $COG_DIR/venv

VOLUME $COG_INSTALL_DIR



# scripts

# startup

COPY scripts/ /usr/local/bin/

COPY conf/cog.conf /etc/supervisor/conf.d/cog.conf

COPY conf/supervisord.cog.conf /etc/supervisor/conf.d/supervisord.cog.conf

ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

# override CMD options at run time

CMD ["localhost", "false", "true"]

cog/conf/cog.conf→cog/conf/supervisord.cog.conf

+0 −0

File moved.

View file

httpd/Dockerfile

+2 −4
Original line number Diff line number Diff line
@@ -32,12 +32,10 @@ COPY conf/ssl.conf /etc/httpd/conf.d/ssl.conf 


EXPOSE 80 443



# startup configuration

ADD conf/apache.conf /etc/supervisor/conf.d/apache.conf

ADD scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh



# start httpd server

# parent process runs as 'root' to access port 80 and configuration files,

# but it does NOT serve client requests

# the child processes that serve user requests run as user 'apache'

ADD conf/supervisord.httpd.conf /etc/supervisor/conf.d/supervisord.httpd.conf

ADD scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

ENTRYPOINT /usr/local/bin/docker-entrypoint.sh

postgres/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -37,5 +37,5 @@ RUN chmod 0600 /root/.pgpass 
EXPOSE 5432



# add supervisor configuration for postgres service

ADD ./conf/postgres.conf /etc/supervisor/conf.d/postgresql.conf

ADD ./conf/supervisord.postgres.conf /etc/supervisor/conf.d/supervisord.postgres.conf

ENTRYPOINT /usr/local/bin/docker-entrypoint.sh