From 8cb02ebe3d0a5c3caba3ddbd2a6fd2b60d9c3ff6 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Fri, 5 Jul 2024 17:31:09 +0100 Subject: [PATCH] ansible: Install shared-mime-info on Centos UBI RHEL and Fedora --- .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml | 1 + .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml | 1 + .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml | 1 + .../roles/DockerStatic/Dockerfiles/Dockerfile.ubi8 | 2 +- .../roles/DockerStatic/Dockerfiles/Dockerfile.ubi9 | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml index 3a2644a4fa..7b4ced9062 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml @@ -116,5 +116,6 @@ Test_Tool_Packages: - fakeroot - gnutls - gnutls-utils + - shared-mime-info - nss-devel - nss-tools diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml index 149ab1d9d9..795891fa5f 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml @@ -138,5 +138,6 @@ Test_Tool_Packages: - gnutls - gnutls-utils - libnss3.so + - shared-mime-info - nss-devel - nss-tools diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml index 757877b394..6022f90a62 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml @@ -118,5 +118,6 @@ Test_Tool_Packages: - mercurial - gnutls - gnutls-utils + - shared-mime-info - nss-devel - nss-tools diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.ubi8 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.ubi8 index 01a78f5a6f..b33cdfab69 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.ubi8 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.ubi8 @@ -54,7 +54,7 @@ RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh # RUN service ssh start CMD ["/usr/sbin/sshd","-D"] -RUN dnf install -y git curl make gcc xorg-x11-server-Xvfb libXrender libXi libXtst fontconfig fakeroot procps-ng hostname diffutils +RUN dnf install -y git curl make gcc xorg-x11-server-Xvfb libXrender libXi libXtst fontconfig fakeroot procps-ng hostname diffutils shared-mime-info RUN dnf install -y coreutils --allowerasing # Install SSL Test packages RUN dnf install -y gnutls gnutls-utils nss nss-tools diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.ubi9 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.ubi9 index ed08ae9364..5b7fa2f720 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.ubi9 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.ubi9 @@ -46,7 +46,7 @@ RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh # RUN service ssh start CMD ["/usr/sbin/sshd","-D"] -RUN dnf install -y git make gcc xorg-x11-server-Xvfb libXrender libXi libXtst fontconfig fakeroot procps-ng hostname diffutils +RUN dnf install -y git make gcc xorg-x11-server-Xvfb libXrender libXi libXtst fontconfig fakeroot procps-ng hostname diffutils shared-mime-info RUN dnf install -y coreutils --allowerasing curl # Install SSL Test packages RUN dnf install -y gnutls gnutls-utils nss nss-tools