Commit 96476afa authored by Matt Pryor's avatar Matt Pryor
Browse files

Move WEBAPP_NAME to higher position in Dockerfiles

parent 9e6e5334

images/idp/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ARG ESGF_IMAGES_VERSION=latest 
ARG WEBAPP_NAME=esgf-idp

ARG ESGF_IDP_ASSETS=https://github.com/ESGF/esgf-idp/releases/download/

ARG ESGF_IDP_VERSION=v2.8.8

ARG WAR_LOCATION=$ESGF_IDP_ASSETS/$ESGF_IDP_VERSION/esgf-idp.war

ARG WAR_LOCATION=$ESGF_IDP_ASSETS/$ESGF_IDP_VERSION/$WEBAPP_NAME.war



FROM ${ESGF_REPOSITORY_BASE}/tomcat-builder:${ESGF_IMAGES_VERSION} as builder

images/orp/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ ARG ESGF_REPOSITORY_BASE=esgfhub 
ARG ESGF_IMAGES_VERSION=latest



# Unpack the esg-orp war

ARG WEBAPP_NAME=esg-orp

ARG ESGF_ORP_ASSETS=https://github.com/ESGF/esg-orp/releases/download/

ARG ESGF_ORP_VERSION=v2.11.0

ARG WAR_LOCATION=$ESGF_ORP_ASSETS/$ESGF_ORP_VERSION/esg-orp.war

ARG WAR_LOCATION=$ESGF_ORP_ASSETS/$ESGF_ORP_VERSION/$WEBAPP_NAME.war

FROM ${ESGF_REPOSITORY_BASE}/tomcat-builder:${ESGF_IMAGES_VERSION} as builder



# Copy the unpacked contents into the runtime container

ARG WEBAPP_NAME=esg-orp

FROM ${ESGF_REPOSITORY_BASE}/tomcat-runtime:${ESGF_IMAGES_VERSION}



# Install custom config and startup scripts

images/search/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ ARG ESGF_REPOSITORY_BASE=esgfhub 
ARG ESGF_IMAGES_VERSION=latest



# Unpack the war

ARG WEBAPP_NAME=esg-search

ARG ESGF_SEARCH_ASSETS=https://github.com/ESGF/esg-search/releases/download/

ARG ESGF_SEARCH_VERSION=v4.17.10

ARG WAR_LOCATION=$ESGF_SEARCH_ASSETS/$ESGF_SEARCH_VERSION/esg-search.war

ARG WAR_LOCATION=$ESGF_SEARCH_ASSETS/$ESGF_SEARCH_VERSION/$WEBAPP_NAME.war

FROM ${ESGF_REPOSITORY_BASE}/tomcat-builder:${ESGF_IMAGES_VERSION} as builder



# Copy the unpacked contents into the runtime container

ARG WEBAPP_NAME=esg-search

FROM ${ESGF_REPOSITORY_BASE}/tomcat-runtime:${ESGF_IMAGES_VERSION}