Revert "Try breaking image up into more layers"

This reverts commit f05b69b.

Author: eflumerf

dockerfiles/alma9-spack-base.dockerfile

@@ -13,25 +13,25 @@ RUN yum clean all \
  && yum clean all
 
 # Tools for building the DAQ release
-RUN dnf install -y kernel-devel asciidoc bzip2 bzip2-devel bzip2-libs compat-openssl11                    && dnf clean all
-RUN dnf install -y cyrus-sasl-devel expat-devel elfutils elfutils-devel elfutils-libs fontconfig-devel    && dnf clean all
-RUN dnf install -y freetype-devel gcc gcc-c++ gcc-gfortran gdb gdbm gdbm-devel gettext-devel git          && dnf clean all
-RUN dnf install -y glibc-devel gperf gtk3-devel java-1.8.0-openjdk java-1.8.0-openjdk-devel               && dnf clean all
-RUN dnf install -y java-1.8.0-openjdk-headless krb5-devel libICE-devel libSM-devel libX11-devel           && dnf clean all
-RUN dnf install -y libXdmcp-devel libXext-devel libXft-devel libXi-devel libXmu-devel libXpm-devel        && dnf clean all
-RUN dnf install -y libXrandr-devel libXrender-devel libXt-devel libXv-devel libXxf86vm-devel              && dnf clean all
-RUN dnf install -y libbsd-devel libcurl-devel libdb-devel libfontenc-devel libgcc libnsl2 librdmacm       && dnf clean all
-RUN dnf install -y libtirpc-devel libtool libunwind-devel libuuid-devel libxkbcommon-devel                && dnf clean all
-RUN dnf install -y libxkbcommon-x11-devel libxshmfence-devel make mesa-libGL-devel mesa-libGLU            && dnf clean all
-RUN dnf install -y mesa-libGLU-devel ncurses-compat-libs ncurses-devel ninja-build numactl-devel          && dnf clean all
-RUN dnf install -y openssh-server openssl openssl-devel patch patchelf perl-devel python3 python3-apipkg  && dnf clean all
-RUN dnf install -y python3-devel python3-libs python3-pip python3-pyyaml python3-setuptools               && dnf clean all
-RUN dnf install -y python3-setuptools_scm readline-devel rsync tar tcl-devel texinfo tk tk-devel unzip    && dnf clean all
-RUN dnf install -y wget xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel             && dnf clean all
-RUN dnf install -y xcb-util-wm-devel xorg-x11-util-macros xorg-x11-xtrans-devel xxhash xxhash-libs        && dnf clean all
-RUN dnf install -y xz-devel zip binutils-devel doxygen jq procps-ng                                       && dnf clean all
-RUN dnf install -y qt5 qt5-qtbase qt5-qtbase-gui qt5-qtbase-devel                                         && dnf clean all
-
+RUN dnf install -y kernel-devel asciidoc bzip2 bzip2-devel bzip2-libs compat-openssl11 \
+                   cyrus-sasl-devel expat-devel elfutils elfutils-devel elfutils-libs fontconfig-devel \
+                   freetype-devel gcc gcc-c++ gcc-gfortran gdb gdbm gdbm-devel gettext-devel git \
+                   glibc-devel gperf gtk3-devel java-1.8.0-openjdk java-1.8.0-openjdk-devel \
+                   java-1.8.0-openjdk-headless krb5-devel libICE-devel libSM-devel libX11-devel \
+                   libXdmcp-devel libXext-devel libXft-devel libXi-devel libXmu-devel libXpm-devel \
+                   libXrandr-devel libXrender-devel libXt-devel libXv-devel libXxf86vm-devel \
+                   libbsd-devel libcurl-devel libdb-devel libfontenc-devel libgcc libnsl2 librdmacm \
+                   libtirpc-devel libtool libunwind-devel libuuid-devel libxkbcommon-devel \
+                   libxkbcommon-x11-devel libxshmfence-devel make mesa-libGL-devel mesa-libGLU \
+                   mesa-libGLU-devel ncurses-compat-libs ncurses-devel ninja-build numactl-devel \
+                   openssh-server openssl openssl-devel patch patchelf perl-devel python3 python3-apipkg \
+                   python3-devel python3-libs python3-pip python3-pyyaml python3-setuptools \
+                   python3-setuptools_scm readline-devel rsync tar tcl-devel texinfo tk tk-devel unzip \
+                   wget xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel \
+                   xcb-util-wm-devel xorg-x11-util-macros xorg-x11-xtrans-devel xxhash xxhash-libs \
+                   xz-devel zip binutils-devel doxygen jq procps-ng \
+                   qt5 qt5-qtbase qt5-qtbase-gui qt5-qtbase-devel \
+&& dnf clean all
 
 RUN dnf install -y https://repo.mongodb.org/yum/redhat/9/mongodb-org/7.0/x86_64/RPMS/mongodb-org-server-7.0.28-1.el9.x86_64.rpm && dnf clean all