From 31399773dc3a64269714936f9f477628dc617eaa Mon Sep 17 00:00:00 2001
From: Chris White <white238@llnl.gov>
Date: Thu, 17 Aug 2023 16:55:28 -0700
Subject: [PATCH] reduce size by bringing all spack commands into a single
 script that deletes everything but the view after successfully building

---
 .../{set-up-spack.sh => build-with-spack.sh}  | 22 +++++++++++++++----
 .../ubuntu/apt-install-defaults-plus-args.sh  |  1 -
 ubuntu/20.04/Dockerfile                       | 16 ++++++--------
 ubuntu/22.04/Dockerfile                       | 18 +++++++--------
 ubuntu/23.04/Dockerfile                       | 17 +++++++-------
 ubuntu/clang/Dockerfile                       | 17 +++++---------
 6 files changed, 48 insertions(+), 43 deletions(-)
 rename scripts/{set-up-spack.sh => build-with-spack.sh} (62%)

diff --git a/scripts/set-up-spack.sh b/scripts/build-with-spack.sh
similarity index 62%
rename from scripts/set-up-spack.sh
rename to scripts/build-with-spack.sh
index 3c02df31ad..5c55b51986 100755
--- a/scripts/set-up-spack.sh
+++ b/scripts/build-with-spack.sh
@@ -11,9 +11,8 @@ popd
 # temporary path update for this script
 export PATH=/opt/spack/bin:$PATH
 
-# Install Clingo for Spack
-python3 -m pip install --upgrade pip
-python3 -m pip install clingo
+# Bootstrap clingo
+spack bootstrap now
 
 # Find packages already installed on system, e.g. autoconf
 # IMPORTANT: ensure that all binaries installed include their development files
@@ -21,7 +20,7 @@ python3 -m pip install clingo
 #            spack
 spack external find # NOTE no all
 # Find some packages out of the default check set that work
-spack external find python perl binutils git tar xz bzip2
+spack external find python perl binutils git tar xz bzip2 hwloc ncurses
 # configure spack
 # build for the generic target
 spack config add 'packages:all:target:[x86_64]'
@@ -29,6 +28,21 @@ spack config add 'packages:all:target:[x86_64]'
 spack config add 'concretizer:reuse:true'
 # Generate spack environment for packages
 spack env create --dir /opt/env --with-view /opt/view
+# Activate created environment
+spack env activate --without-view /opt/env
+# Add binary mirror
+spack mirror add develop https://binaries.spack.io/releases/develop
+# Move install tree outside of spack directory so spack repo can be removed after
+spack config add "config:install_tree:root:'/opt'"
+# Concretize spec
+spack spec --reuse $0
+# Add spec to environment
+spack add $0
+spack buildcache keys --install --trust
+spack install --fail-fast
+
+# delete spack to save space
+rm -rf /opt/spack
 
 # ensure clangs and others that don't inject rpaths make working executables
 cat >/etc/ld.so.conf.d/spack_view.conf <<EOF
diff --git a/scripts/ubuntu/apt-install-defaults-plus-args.sh b/scripts/ubuntu/apt-install-defaults-plus-args.sh
index cf178d15cd..cc2eb3aa47 100755
--- a/scripts/ubuntu/apt-install-defaults-plus-args.sh
+++ b/scripts/ubuntu/apt-install-defaults-plus-args.sh
@@ -5,7 +5,6 @@ packages=(
   # fetchers
   ca-certificates
   curl
-  git
   wget
   # interactive tools
   valgrind
diff --git a/ubuntu/20.04/Dockerfile b/ubuntu/20.04/Dockerfile
index 90a3abdea6..71d041042f 100644
--- a/ubuntu/20.04/Dockerfile
+++ b/ubuntu/20.04/Dockerfile
@@ -2,8 +2,6 @@ FROM ubuntu:20.04@sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026
 
 LABEL maintainer="Chris White <white238@llnl.gov>,@vsoch"
 
-ARG uptodate_github_commit_spack__spack__develop=e381e166ec27bb56c2d3bc856e7020224a005d1d
-ENV spack_commit=${uptodate_github_commit_spack__spack__develop}
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/Los_Angeles
 
@@ -14,12 +12,12 @@ ENV PATH=/opt/view/bin:/opt/spack/bin:$PATH \
     CMAKE_PREFIX_PATH=/opt/view \
     ACLOCAL_PATH=/opt/view/share/aclocal
 
+# Install repository scripts dir to /opt/scripts
+RUN apt-get -qq update && apt-get -qq install -y --no-install-recommends git
+# TODO: REMOVE THE BRANCH BEFORE MERGING
+RUN GIT_SSL_NO_VERIFY=1 git clone -b task/white238/reduce_size https://github.com/rse-ops/docker-images.git && cp -R docker-images/scripts /opt/scripts && rm -rf docker-images
+
+# Install base packages
 WORKDIR /opt
-COPY ./scripts /opt/scripts
-# Install spack
 RUN ./scripts/ubuntu/apt-install-defaults-plus-args.sh && \
-    ./scripts/install-cmake-binary.sh && \
-    ./scripts/set-up-spack.sh
-# Tell spack to use this one without arguments
-# NOTE: this has to be here, setting it earlier will kill spack
-ENV SPACK_ENV=/opt/env
+    ./scripts/install-cmake-binary.sh
diff --git a/ubuntu/22.04/Dockerfile b/ubuntu/22.04/Dockerfile
index 337224d0bd..0830dc9032 100644
--- a/ubuntu/22.04/Dockerfile
+++ b/ubuntu/22.04/Dockerfile
@@ -2,8 +2,6 @@ FROM ubuntu:22.04@sha256:ec050c32e4a6085b423d36ecd025c0d3ff00c38ab93a3d71a460ff1
 
 LABEL maintainer="@vsoch"
 
-ARG uptodate_github_commit_spack__spack__develop=e381e166ec27bb56c2d3bc856e7020224a005d1d
-ENV spack_commit=${uptodate_github_commit_spack__spack__develop}
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/Los_Angeles
 
@@ -14,12 +12,14 @@ ENV PATH=/opt/view/bin:/opt/spack/bin:$PATH \
     CMAKE_PREFIX_PATH=/opt/view \
     ACLOCAL_PATH=/opt/view/share/aclocal
 
+# Install repository scripts dir to /opt/scripts
+RUN apt-get -qq update && apt-get -qq install -y --no-install-recommends git
+# TODO: Fix the git commands before merging
+RUN GIT_SSL_NO_VERIFY=1 git clone -b task/white238/reduce_size https://github.com/white238/docker-images.git && \
+    cp -R docker-images/scripts /opt/scripts && \
+    rm -rf docker-images
+
+# Install base packages
 WORKDIR /opt
-COPY ./scripts /opt/scripts
-# Install spack
 RUN ./scripts/ubuntu/apt-install-defaults-plus-args.sh && \
-    ./scripts/install-cmake-binary.sh && \
-    ./scripts/set-up-spack.sh
-# Tell spack to use this one without arguments
-# NOTE: this has to be here, setting it earlier will kill spack
-ENV SPACK_ENV=/opt/env
+    ./scripts/install-cmake-binary.sh
diff --git a/ubuntu/23.04/Dockerfile b/ubuntu/23.04/Dockerfile
index 337224d0bd..834c793a02 100644
--- a/ubuntu/23.04/Dockerfile
+++ b/ubuntu/23.04/Dockerfile
@@ -1,9 +1,8 @@
+# TODO: fix this, it is pointing at 22.04 not 23.04
 FROM ubuntu:22.04@sha256:ec050c32e4a6085b423d36ecd025c0d3ff00c38ab93a3d71a460ff1c44fa6d77
 
 LABEL maintainer="@vsoch"
 
-ARG uptodate_github_commit_spack__spack__develop=e381e166ec27bb56c2d3bc856e7020224a005d1d
-ENV spack_commit=${uptodate_github_commit_spack__spack__develop}
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/Los_Angeles
 
@@ -14,12 +13,12 @@ ENV PATH=/opt/view/bin:/opt/spack/bin:$PATH \
     CMAKE_PREFIX_PATH=/opt/view \
     ACLOCAL_PATH=/opt/view/share/aclocal
 
+# Install repository scripts dir to /opt/scripts
+RUN apt-get -qq update && apt-get -qq install -y --no-install-recommends git
+# TODO: REMOVE THE BRANCH BEFORE MERGING
+RUN GIT_SSL_NO_VERIFY=1 git clone -b task/white238/reduce_size https://github.com/rse-ops/docker-images.git && cp -R docker-images/scripts /opt/scripts && rm -rf docker-images
+
+# Install base packages
 WORKDIR /opt
-COPY ./scripts /opt/scripts
-# Install spack
 RUN ./scripts/ubuntu/apt-install-defaults-plus-args.sh && \
-    ./scripts/install-cmake-binary.sh && \
-    ./scripts/set-up-spack.sh
-# Tell spack to use this one without arguments
-# NOTE: this has to be here, setting it earlier will kill spack
-ENV SPACK_ENV=/opt/env
+    ./scripts/install-cmake-binary.sh
diff --git a/ubuntu/clang/Dockerfile b/ubuntu/clang/Dockerfile
index 3f650ba977..c2a597e2c5 100644
--- a/ubuntu/clang/Dockerfile
+++ b/ubuntu/clang/Dockerfile
@@ -1,5 +1,5 @@
 ARG ubuntu_version
-FROM ghcr.io/rse-ops/ubuntu:$ubuntu_version
+FROM white238:ubuntu22_base
 
 # Install llvm with spack
 ARG llvm_version
@@ -12,16 +12,11 @@ ENV llvm_spec="llvm@${llvm_version}+llvm_dylib+link_llvm_dylib~split_dwarf~lldb~
     CXX=/opt/view/bin/clang++ \
     CPP=/opt/view/bin/clang-cpp
 
-# build compiler and set defaults
-RUN spack external find hwloc ncurses \
- && spack spec --reuse "${llvm_spec}" \
- && spack add "${llvm_spec}" \
- && spack mirror add develop https://binaries.spack.io/releases/develop \
- && spack buildcache keys --install --trust \
- && spack install --fail-fast \
- && spack compiler add \
- && spack config add "packages:all:compiler:[${COMPILER_NAME}@${COMPILER_VERSION}]" \
- && update-alternatives --install /usr/bin/cc cc ${CC} 50 \
+# build compiler and set defaults then remove spack to keep image size small
+ARG uptodate_github_commit_spack__spack__develop=b8590fbd057621c9b71c5b274b21e1802d52bc45
+ENV spack_commit=${uptodate_github_commit_spack__spack__develop}
+RUN ./scripts/build-with-spack.sh "${llvm_spec}"
+RUN update-alternatives --install /usr/bin/cc cc ${CC} 50 \
  && update-alternatives --install /usr/bin/c++ c++ ${CXX} 50 \
  && update-alternatives --install /usr/bin/cpp cpp ${CPP} 50 \
  && update-alternatives --install /usr/bin/c89 c89 ${CC} 50 \