Commit 07f6c7dd authored Aug 29, 2017 by Luca Cinquini

Cleaning up devel images.

parent c701593b

node-manager/Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		# /esg/config/nm.properties
		# /esg/config/esgf_nodemgr_map.json : periodically updated to reflect nodes status

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

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

scripts/docker_build_and_push_all.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ pushit=${2:-false}
		wrkdir=`pwd`

		# loop over ordered list of ESGF images
		subdirs=('node' 'postgres' 'tomcat' 'solr' 'httpd' 'cog' 'data-node' 'idp-node' 'index-node' 'vsftp' 'solr-cloud')
		subdirs=('node' 'postgres' 'tomcat' 'solr' 'httpd' 'cog' 'data-node' 'idp-node' 'index-node' 'slcs-server' 'node-manager' 'vsftp' 'solr-cloud')

		for subdir in ${subdirs[*]}; do
		# cd to parallel directory

solr-cloud/Dockerfile

+4 −1

Original line number	Diff line number	Diff line
		# Solr-Cloud installation configured for ESGF data

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

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

		@@ -39,3 +39,6 @@ RUN cd $SRC_DIR && \
		COPY scripts/ /usr/local/bin/

		EXPOSE 8983 8984 8985

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