Commit 0772475f authored by William Tucker's avatar William Tucker
Browse files

Merge branch 'master' of https://github.com/ESGF/esgf-docker into...

Merge branch 'master' of https://github.com/ESGF/esgf-docker into feature/configurable-search-timeouts
parents 655536c5 6e20a1e3
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@
#####

- name: Install auth application
  include: auth_install.yml
  include_tasks: auth_install.yml
  when: auth_enabled

- name: Uninstall auth application
  include: auth_uninstall.yml
  include_tasks: auth_uninstall.yml
  when: not auth_enabled
+6 −6
Original line number Diff line number Diff line
@@ -5,25 +5,25 @@
#####

- name: Install THREDDS
  include: thredds_install.yml
  include_tasks: thredds_install.yml
  when: "'data' in group_names and thredds_enabled"

- name: Uninstall THREDDS
  include: thredds_uninstall.yml
  include_tasks: thredds_uninstall.yml
  when: "'data' not in group_names or not thredds_enabled"

- name: Install Nginx fileserver
  include: fileserver_install.yml
  include_tasks: fileserver_install.yml
  when: "'data' in group_names and fileserver_enabled"

- name: Uninstall Nginx fileserver
  include: fileserver_uninstall.yml
  include_tasks: fileserver_uninstall.yml
  when: "'data' not in group_names or not fileserver_enabled"

- name: Install logstash log exporter
  include: logstash_install.yml
  include_tasks: logstash_install.yml
  when: "'data' in group_names and logstash_enabled"

- name: Uninstall logstash log exporter
  include: logstash_uninstall.yml
  include_tasks: logstash_uninstall.yml
  when: "'data' not in group_names or not logstash_enabled"
+5 −5
Original line number Diff line number Diff line
@@ -5,20 +5,20 @@
#####

- name: Install Solr
  include: solr_install.yml
  include_tasks: solr_install.yml
  when: "'index' in group_names and solr_enabled"

- name: Uninstall Solr
  include: solr_uninstall.yml
  include_tasks: solr_uninstall.yml
  when: "'index' not in group_names or not solr_enabled"

- name: Reconcile Solr replicas
  include: solr_replica_reconcile.yml
  include_tasks: solr_replica_reconcile.yml

- name: Install search application
  include: search_install.yml
  include_tasks: search_install.yml
  when: "'index' in group_names and search_enabled"

- name: Uninstall search application
  include: search_uninstall.yml
  include_tasks: search_uninstall.yml
  when: "'index' not in group_names or not search_enabled"
+3 −0
Original line number Diff line number Diff line
@@ -51,3 +51,6 @@ solr_enabled: true

# Indicates if search is enabled
search_enabled: true

# Indicates if the auth service should be deployed or not
auth_enabled: false
+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 dnf makecache && \
    dnf install -y java-11-openjdk-devel-11.0.22.0.7-2.el9 && \
    dnf install -y java-11-openjdk-devel-11.0.23.0.9-3.el9 && \
    dnf clean all
Loading