Commit 5068cda1 authored by Luca Cinquini's avatar Luca Cinquini
Browse files

PLacing ARGs first in Dockerfile.

parent b42608c3

auth/Dockerfile

+3 −3
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

+2 −3
Original line number Diff line number Diff line
@@ -7,11 +7,10 @@ 
# 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}



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

FROM $ESGF_IMAGES_HUB/esgf-node:$ESGF_VERSION

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



# choose CoG version

ENV COG_TAG=v3.9.7

dashboard/Dockerfile

+1 −5
Original line number Diff line number Diff line
@@ -6,14 +6,10 @@ 


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-tomcat:$ESGF_VERSION



MAINTAINER ESGF <esgf-devel@lists.llnl.gov>



# default ESGF repository

ARG ESGF_REPO=http://distrib-coffee.ipsl.jussieu.fr/pub/esgf



ENV DASHBOARD_HOME /usr/local/esgf-dashboard-ip



# install library dependencies

data-node/Dockerfile

+2 −4
Original line number Diff line number Diff line
@@ -4,14 +4,12 @@ 
# o ORP

# o Dashboard



FROM $ESGF_IMAGES_HUB/esgf-tomcat:$ESGF_VERSION

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



ARG ESGF_IMAGES_HUB=esgfhub

ARG ESGF_VERSION=devel



# default ESGF repository

ARG ESGF_REPO=http://distrib-coffee.ipsl.jussieu.fr/pub/esgf

FROM $ESGF_IMAGES_HUB/esgf-tomcat:$ESGF_VERSION

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



#============================================

httpd/Dockerfile

+2 −3
Original line number Diff line number Diff line 
# ESGF node with Apache httpd and mod_wsgi



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

FROM $ESGF_IMAGES_HUB/esgf-node:$ESGF_VERSION

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



# install latest apache httpd

RUN yum -y update \