Resolved merge conflicts - updated with latest dev changes

Author: kzgrzendek

README.md

@@ -7,8 +7,6 @@ This repository is hosting the container images that are needed to run the REDCa
 Those images are as follow : 
 - `httpd-shibd` : A custom container made to host an instance of Apache HTTPd and Shibboleth.
    - [see the `httpd-shibd` folder](./httpd-shibd/)
-- `fastcgi-client` : A simple FastCGI client.
-   - [see the `fastcgi-client` folder](./fastcgi-client/)
 - `php-fpm` : A PHP 8.2 FPM server that contains all dependencies and configurations needed by REDCap.
    - [see the `php-fpm` folder](./php-fpm/)
 

httpd-shibd/Dockerfile

@@ -8,10 +8,10 @@ RUN dnf install -y epel-release &&\
     dnf update -y &&\
     dnf upgrade -y &&\
     dnf install -y \
-        supervisor \ 
-        httpd \ 
-        shibboleth.x86_64 \
-        mod_ssl &&\
+        supervisor \
+        httpd \
+        mod_ssl \
+        shibboleth.x86_64 &&\
     dnf clean all
 
 RUN ls -lah /var/run 

php-fpm/Dockerfile

@@ -1,25 +1,21 @@
 FROM php:8.2-fpm-bookworm
 
-### Installing required packages
-RUN apt update -y &&\
-    apt upgrade -y &&\
-    apt -y --no-install-recommends install \
-        net-tools  \
-        vim \
-        wget \
-        curl \
-        ghostscript \
-        libcurl4-openssl-dev \
-        zip \
+### Installing required packages and removing useless ones (to fix CVEs)
+RUN apt-get update -y &&\
+    apt-get upgrade -y &&\
+    apt-get purge -y \
+        wget &&\
+    apt-get install -y --no-install-recommends \
+        libfcgi-bin \
         msmtp \
+        libcurl4-openssl-dev \
         libzip-dev \
         libfreetype6-dev \
         libjpeg62-turbo-dev \
         imagemagick \
         libmagickwand-dev \
-        libpng-dev \
-        dos2unix && \
-    apt clean && \
+        libpng-dev &&\
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
 # Installing PHP extensions