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

Merge pull request #204 from ESGF/rocky9-alma9 

Rocky9 alma9
parents 0ab69b07 14a3989c

deploy/ansible/roles/docker/tasks/main.yml

+18 −14
Original line number Diff line number Diff line 
---



- name: Install Docker

  yum:

    name: docker

    state: latest

- name: Add Docker Repo

  command: dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo

  register: docker_install



- name: Remove podman installation

  command: dnf remove -y podman buildah

  when: ansible_distribution == 'AlmaLinux'



- name: Install Docker

  command: dnf install -y docker-ce docker-ce-cli containerd.io



- name: Start Docker Daemon

  command: systemctl start docker



- name: Make docker.service.d directory

  file:

    path: /usr/lib/systemd/system/docker.service.d
@@ -36,20 +44,16 @@ 
  when: docker_install is changed or system_daemon_reload is changed



# The Ansible Docker modules require the Docker Python SDK, which requires pip to install, which requires EPEL

- name: Install EPEL

  yum:

    name: epel-release

    state: latest



- name: Install pip for system python

- name: Install pip for system python on CentOS / RHEL

  yum:

    name: python-pip

    name: pip

    state: latest

  when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'



- name: Update pip to more recent version (but not py3 latest)

  pip:

    name: pip

    version: 19.0

- name: Install python-pip on AlmaLinux

  command: dnf install -y python-pip

  when: ansible_distribution == 'AlmaLinux'



- name: Install Docker SDK

  pip:

deploy/ansible/roles/index/tasks/solr_install.yml

+4 −4
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 
  docker_network:

    name: esgf



- name: Create Solr master home volume

- name: Create Solr parent home volume

  docker_volume:

    name: solr-master-home



- name: Start Solr master container

- name: Start Solr parent container

  docker_container:

    name: solr-master

    image: "{{ solr_image_prefix }}/{{ solr_image_repository }}:{{ solr_image_tag }}"
@@ -40,11 +40,11 @@ 
        {% endfor %}

      ]



- name: Create Solr slave home volume

- name: Create Solr child home volume

  docker_volume:

    name: solr-slave-home



- name: Start Solr slave container

- name: Start Solr child container

  docker_container:

    name: solr-slave

    image: "{{ solr_image_prefix }}/{{ solr_image_repository }}:{{ solr_image_tag }}"

images/thredds/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as builder 


# Unpack the THREDDS war

ARG THREDDS_VERSION=5.5

ARG THREDDS_SHA1=ff6f378892cdd78a1c686802325d7a6021c78253

ARG THREDDS_SHA1=e9d1857dd8a4d670f7dd3ff7a3d2e6ef5d6a9a16

ARG THREDDS_URL=https://downloads.unidata.ucar.edu/tds/$THREDDS_VERSION/thredds-$THREDDS_VERSION-SNAPSHOT.war

RUN mkdir /application && \

    cd /application && \