Commit 36e063f8 authored Aug 02, 2018 by LucaCinquini

Building frm ubuntu/tomcat image

parent c4867781

idp-node/Dockerfile

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		ARG ESGF_HUB=esgfhub
		ARG ESGF_PREFIX=
		ARG ESGF_VERSION=latest
		ARG ESGF_HUB_ALT=esgfhublc

		# This build stage is required because COPY --from=$ARG is not supported
		# https://github.com/moby/moby/issues/34482
		@@ -35,7 +36,7 @@ RUN mkdir /opt/esgf-idp && \
		## Stage 2 ##
		#############

		FROM ${ESGF_HUB}/${ESGF_PREFIX}tomcat:$ESGF_VERSION
		FROM ${ESGF_HUB_ALT}/${ESGF_PREFIX}tomcat:$ESGF_VERSION

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

index-node/Dockerfile

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		ARG ESGF_HUB=esgfhub
		ARG ESGF_PREFIX=
		ARG ESGF_VERSION=latest
		ARG ESGF_HUB_ALT=esgfhublc

		# This build stage is required because COPY --from=$ARG is not supported
		# https://github.com/moby/moby/issues/34482
		@@ -39,7 +40,7 @@ RUN mkdir /opt/esg-search && \
		## Stage 2 ##
		#############

		FROM ${ESGF_HUB}/${ESGF_PREFIX}tomcat:$ESGF_VERSION
		FROM ${ESGF_HUB_ALT}/${ESGF_PREFIX}tomcat:$ESGF_VERSION

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

orp/Dockerfile

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		ARG ESGF_HUB=esgfhub
		ARG ESGF_PREFIX=
		ARG ESGF_VERSION=latest
		ARG ESGF_HUB_ALT=esgfhublc

		# This build stage is required because COPY --from=$ARG is not supported
		# https://github.com/moby/moby/issues/34482
		@@ -35,7 +36,7 @@ RUN mkdir /opt/esg-orp && \
		## Stage 2 ##
		#############

		FROM ${ESGF_HUB}/${ESGF_PREFIX}tomcat:$ESGF_VERSION
		FROM ${ESGF_HUB_ALT}/${ESGF_PREFIX}tomcat:$ESGF_VERSION

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

tds/Dockerfile

+2 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		ARG ESGF_HUB=esgfhub
		ARG ESGF_PREFIX=
		ARG ESGF_VERSION=latest
		ARG ESGF_HUB_ALT=esgfhublc

		# This build stage is required because COPY --from=$ARG is not supported
		# https://github.com/moby/moby/issues/34482
		@@ -82,7 +83,7 @@ RUN chmod -R g+w /opt/thredds
		## Stage 2 ##
		#############

		FROM ${ESGF_HUB}/${ESGF_PREFIX}tomcat:$ESGF_VERSION
		FROM ${ESGF_HUB_ALT}/${ESGF_PREFIX}tomcat:$ESGF_VERSION

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