Commit af15c5dc authored by William Tucker's avatar William Tucker
Browse files

Merge branch 'java11' of github.com:ESGF/esgf-docker into thredds-upgrade

parents 63aa0b9e 839a494f

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

+23 −9
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") }}
@@ -22,15 +22,21 @@ spec: 
          {{- if .Values.data.enabled }}

          {{- if .Values.data.thredds.enabled }}

          - path: /thredds

            pathType: Prefix

            backend:

              serviceName: {{ include "esgf.component.fullname" (list . "thredds") }}

              servicePort: 8080

              service:

                name: {{ include "esgf.component.fullname" (list . "thredds") }}

                port:

                  number: 8080

          {{- end }}

          {{- if .Values.data.fileServer.enabled }}

          - path: /thredds/fileServer

            pathType: Prefix

            backend:

              serviceName: {{ include "esgf.component.fullname" (list . "fileServer") }}

              servicePort: 8080

              service:

                name: {{ include "esgf.component.fullname" (list . "fileServer") }}

                port:

                  number: 8080

          {{- end }}

          {{- end }}

          {{- if .Values.index.enabled }}
@@ -39,19 +45,27 @@ spec: 
          # However wildcard paths are not supported on all ingress controllers

          # So we make a path definition for each core

          - path: /solr/aggregations/replication

            pathType: Prefix

            backend: &solr

              # We point to the Solr slave

              serviceName: {{ include "esgf.component.fullname" (list . "solr" "slave") }}

              servicePort: 8983

              service:

                name: {{ include "esgf.component.fullname" (list . "solr" "slave") }}

                port:

                  number: 8983

          - path: /solr/datasets/replication

            pathType: Prefix

            backend: *solr

          - path: /solr/files/replication

            pathType: Prefix

            backend: *solr

          {{- end }}

          {{- if .Values.index.search.enabled }}

          - path: /esg-search

            pathType: Prefix

            backend:

              serviceName: {{ include "esgf.component.fullname" (list . "search") }}

              servicePort: 8080

              service:

                name: {{ include "esgf.component.fullname" (list . "search") }}

                port:

                  number: 8080

          {{- end }}

          {{- end }}

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/solr/Dockerfile

+6 −1
Original line number Diff line number Diff line
@@ -4,10 +4,15 @@ 


ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

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

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



USER root



# Specific version of Java required by SOLR

RUN yum makecache && \

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

    yum clean all



# Create Solr home directory

ENV SOLR_HOME="/var/solr/data" \

    SOLR_LOGS_DIR="/var/solr/logs" \