Commit 5a1fb396 authored Aug 29, 2017 by Luca Cinquini

Cleaning up devel images.

parent c9b0434d

cog/Dockerfile

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		# To map the local source directory:
		# docker run -ti -p 8000:8000 --name cog -v /Users/cinquini/Documents/workspace/cog:/usr/local/cog/cog_install esgfhub/esgf-cog:${ESGF_VERSION}

		FROM esgfhub/esgf-node:1.2
		FROM esgfhub/esgf-node:devel

		MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>

		@@ -92,7 +92,7 @@ RUN groupadd -r cogadmin && \
		RUN echo 'export PS1="[\u@\h]\$ "' >> ~cogadmin/.bashrc

		# change ownership of application directories
		RUN chown -R cogadmin:cogadmin $COG_DIR
		#RUN chown -R cogadmin:cogadmin $COG_DIR

		# expose software installation directories
		# needed by apache httpd running cog through mod_wsgi

httpd/Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		# ESGF node with Apache httpd and mod_wsgi

		FROM esgfhub/esgf-node:1.2
		FROM esgfhub/esgf-node:devel

		MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>

httpd/scripts/docker-entrypoint.sh

+1 −5

Original line number	Diff line number	Diff line
		@@ -9,8 +9,4 @@ rm -f /etc/httpd/conf.d/ssl.conf
		rm -f /etc/httpd/conf.d/welcome.conf

		# start supervisor --> httpd service
		supervisord -c /etc/supervisord.conf

		# keep container running by printing log to standard out
		sleep 2
		tail -f /etc/httpd/logs/error_log
		supervisord --nodaemon -c /etc/supervisord.conf

idp-node/Dockerfile

+2 −1

Original line number	Diff line number	Diff line
		# ESGF Identity Provider node
		# Implemented as Java web servlet application running inside Tomcat container.

		FROM esgfhub/esgf-tomcat:1.2
		FROM esgfhub/esgf-tomcat:devel

		MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>

		@@ -18,3 +18,4 @@ RUN cd /usr/local/tomcat/webapps/esgf-idp/ && \
		# Override Tomcat startup to wait for Postgred connection to be ready
		COPY scripts/wait_for_postgres.sh /usr/local/bin/wait_for_postgres.sh
		COPY conf/supervisord.tomcat.conf /etc/supervisor/conf.d/supervisord.tomcat.conf
		CMD ["supervisord", "--nodaemon", "-c", "/etc/supervisord.conf"]

node/Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,5 +96,5 @@ ENV ESGF_HOME /esg

		# default command starts supervisor in non-daemon mode
		# to be overridden by child images
		# NOTE: do not use ENTTRYPOINT as it would interfere with arguments to certificate generation
		# NOTE: do not use ENTRYPOINT as it would interfere with arguments to certificate generation
		CMD ["supervisord", "--nodaemon", "-c", "/etc/supervisord.conf"]