Unverified Commit ed3f0e72 authored by watucker's avatar watucker Committed by GitHub
Browse files

Merge pull request #171 from ESGF/update-base-image 

Update base image
parents 95f5b76c be1bb5e7

deploy/kubernetes/chart/files/search/esgf_shards_static.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
    {{- if $solr.enabled }}

    <value>{{ include "esgf.component.fullname" (list $ "solr" .name) }}:8983/solr</value>

    {{- else }}

    <value>{{ .masterUrl | required "Replica masterUrl is required" }}</value>

    <value>{{ .masterUrl | required "Replica masterUrl is required" }}</value> {{- if .name }} <!-- {{ .name }} -->{{- end }}

    {{- end }}

    {{- end }}

</shards>

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="202105041404"; \

RUN CACHE_BUST="20220421"; \

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



# Install ca-certificates and openssl

images/jdk/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -12,5 +12,5 @@ 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.292.b10 && \

    yum install -y java-1.8.0-openjdk-devel-1.8.0.322.b06 && \

    yum clean all

images/jre/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 
USER root



RUN yum makecache && \

    yum install -y java-1.8.0-openjdk-headless-1.8.0.292.b10 && \

    yum install -y java-1.8.0-openjdk-headless-1.8.0.322.b06 && \

    yum clean all



USER $ESGF_UID