Commit b42608c3 authored Nov 15, 2017 by Luca Cinquini

Placing FROM statement first

parent 703c648a

auth/Dockerfile

+3 −4

Original line number	Diff line number	Diff line
		# ESGF-Auth client application.

		FROM $ESGF_IMAGES_HUB/esgf-node:$ESGF_VERSION
		MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>

		ARG ESGF_IMAGES_HUB=esgfhub
		ARG ESGF_VERSION=devel
		ARG ESGF_REPO=http://distrib-coffee.ipsl.jussieu.fr/pub/esgf

		FROM $ESGF_IMAGES_HUB/esgf-node:$ESGF_VERSION

		MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>

		# installation directory
		ENV ESGF_AUTH_INSTALL_DIR=/usr/local/esgf-auth

cog/Dockerfile

+3 −4

Original line number	Diff line number	Diff line
		@@ -7,12 +7,11 @@
		# 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 $ESGF_IMAGES_HUB/esgf-cog:${ESGF_VERSION}

		ARG ESGF_IMAGES_HUB=esgfhub
		ARG ESGF_VERSION=devel

		FROM $ESGF_IMAGES_HUB/esgf-node:$ESGF_VERSION
		MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>

		MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>
		ARG ESGF_IMAGES_HUB=esgfhub
		ARG ESGF_VERSION=devel

		# choose CoG version
		ENV COG_TAG=v3.9.7

data-node/Dockerfile

+3 −4

Original line number	Diff line number	Diff line
		@@ -4,12 +4,11 @@
		# o ORP
		# o Dashboard

		ARG ESGF_IMAGES_HUB=esgfhub
		ARG ESGF_VERSION=devel

		FROM $ESGF_IMAGES_HUB/esgf-tomcat:$ESGF_VERSION
		MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>

		MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>
		ARG ESGF_IMAGES_HUB=esgfhub
		ARG ESGF_VERSION=devel

		# default ESGF repository
		ARG ESGF_REPO=http://distrib-coffee.ipsl.jussieu.fr/pub/esgf

httpd/Dockerfile

+3 −4

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

		ARG ESGF_IMAGES_HUB=esgfhub
		ARG ESGF_VERSION=devel

		FROM $ESGF_IMAGES_HUB/esgf-node:$ESGF_VERSION
		MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>

		MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>
		ARG ESGF_IMAGES_HUB=esgfhub
		ARG ESGF_VERSION=devel

		# install latest apache httpd
		RUN yum -y update \

idp-node/Dockerfile

+3 −4

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

		ARG ESGF_IMAGES_HUB=esgfhub
		ARG ESGF_VERSION=devel

		FROM $ESGF_IMAGES_HUB/esgf-tomcat:$ESGF_VERSION
		MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>

		MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>
		ARG ESGF_IMAGES_HUB=esgfhub
		ARG ESGF_VERSION=devel

		# ESGF esg-idp web application
		ARG ESGF_REPO=http://distrib-coffee.ipsl.jussieu.fr/pub/esgf