Commit 84540e2d authored by Matt Pryor's avatar Matt Pryor
Browse files

Small updates to images

parent 19d09633

images/base/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ ENV LC_ALL en_US.UTF-8 


# Upgrade all existing packages

# Updating CACHE_BUST to the current time will bust the cache and force a rebuild

RUN CACHE_BUST="202003191437"; \

RUN CACHE_BUST="202005221033"; \

    yum makecache && yum upgrade -y && yum clean all



# Install ca-certificates and openssl

images/jdk/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 
## Runtime Java images should use the JRE only

#####



ARG ESGF_REPOSITORY_BASE=esgfhub

ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION}



USER root



RUN yum makecache && \

    yum install -y java-1.8.0-openjdk-devel-1.8.0.242* && \

    yum install -y java-1.8.0-openjdk-devel-1.8.0.252.b09 && \

    yum clean all

images/jre/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ 
## Intended for use as a base image for runtime Java images

#####



ARG ESGF_REPOSITORY_BASE=esgfhub

ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION}



USER root



RUN yum makecache && \

    yum install -y java-1.8.0-openjdk-1.8.0.242* && \

    yum install -y java-1.8.0-openjdk-headless-1.8.0.252.b09 && \

    yum clean all



USER $ESGF_UID

images/nginx/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
## Configuration can be either injected by child images or by mounting files.

#####



ARG ESGF_REPOSITORY_BASE=esgfhub

ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION}

images/thredds/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
## Image for running THREDDS

#####



ARG ESGF_REPOSITORY_BASE=esgfhub

ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest



FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as builder