Unverified Commit c47aadde authored by William Tucker's avatar William Tucker Committed by GitHub
Browse files

Merge pull request #220 from Reillyhewitson/features/rocky9 

Features/rocky9
parents 66c9e29a 628013b4

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
# The Ansible Docker modules require the Docker Python SDK, which requires pip to install, which requires EPEL



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

  yum:

  dnf:

    name: pip

    state: latest

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

images/base/Dockerfile

+5 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
## Currently just a fully-updated CentOS 7 with common packages and entrypoint

#####



FROM centos:7.8.2003

FROM rockylinux:9.2.20230513



# Create the esgf user that will be used to run apps

ENV ESGF_UID 1000
@@ -27,12 +27,12 @@ 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="20220923"; \

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

    dnf makecache && dnf upgrade -y && dnf clean all



# Install ca-certificates and openssl

RUN yum makecache && \

    yum install -y epel-release ca-certificates openssl && \

    yum clean all

RUN dnf makecache && \

    dnf install -y epel-release ca-certificates openssl && \

    dnf clean all



# Install Tini

ENV TINI_VERSION v0.18.0

images/jdk/Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 


USER root



RUN yum makecache && \

    yum install -y java-11-openjdk-devel-11.0.15.0.9 && \

    yum clean all
 
RUN dnf makecache && \

    dnf install -y java-11-openjdk-devel-11.0.20.0.8-3.el9 && \

    dnf clean all

images/jre/Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 


USER root



RUN yum makecache && \

    yum install -y java-11-openjdk-headless-11.0.15.0.9 && \

    yum clean all

RUN dnf makecache && \

    dnf install -y java-11-openjdk-headless-11.0.20.0.8-3.el9 && \

    dnf clean all



USER $ESGF_UID

images/logstash/Dockerfile

+8 −3
Original line number Diff line number Diff line
@@ -19,9 +19,14 @@ ENV LS_SETTINGS_DIR /etc/logstash 
# In the same command, in order to avoid another layer, transfer ownership of

# /usr/share/logstash to the ESGF user and group

COPY logstash.repo /etc/yum.repos.d/logstash.repo

RUN yum makecache && \

    yum install -y logstash-7.10.0 && \

    yum clean all && \



# SHA1 is disabled by default in rocky9. 

# Logstash does not have a SHA512 hash yet.

# So SHA1 needs to be enabled to install it.

RUN update-crypto-policies --set DEFAULT:SHA1

RUN dnf makecache && \

    dnf install -y logstash-7.10.0 && \

    dnf clean all && \

    chown -R $ESGF_UID:$ESGF_GID /usr/share/logstash



# Install configuration files