Unverified Commit 599b7af2 authored Jun 30, 2022 by watucker Committed by GitHub Jun 30, 2022

Merge pull request #176 from ESGF/watucker-patch-1

Update base image

parents cffda093 5c87df8c

deploy/kubernetes/chart/templates/ingress/ingress.yaml

+1 −1

Original line number	Diff line number	Diff line
		apiVersion: networking.k8s.io/v1beta1
		apiVersion: networking.k8s.io/v1
		kind: Ingress
		metadata:
		name: {{ include "esgf.component.fullname" (list . "ingress") }}

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="20220421"; \
		RUN CACHE_BUST="20220628"; \
		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.322.b06 && \
		yum install -y java-1.8.0-openjdk-devel-1.8.0.332.b09 && \
		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.322.b06 && \
		yum install -y java-1.8.0-openjdk-headless-1.8.0.332.b09 && \
		yum clean all

		USER $ESGF_UID