From 1292d79f3cb3465c4d8decc042cb35bfabc27f10 Mon Sep 17 00:00:00 2001
From: David Beckingsale <davidbeckingsale@gmail.com>
Date: Tue, 12 Dec 2023 12:36:46 -0800
Subject: [PATCH] Starting to switch to apt based builds

---
 alpine/3.14/Dockerfile                        |  25 ---------
 alpine/uptodate.yaml                          |   7 ---
 img/rse-ops-docker.png                        | Bin 13056 -> 0 bytes
 scripts/set-up-spack.sh                       |  40 --------------
 ...install-defaults-plus-args.sh => setup.sh} |  49 ++++++++++--------
 ubuntu/20.04/Dockerfile                       |  21 ++------
 ubuntu/23.04/Dockerfile                       |  25 ---------
 ubuntu/24.04/Dockerfile                       |  25 ---------
 ubuntu/clang/Dockerfile                       |  43 +++++++--------
 ubuntu/clang/uptodate.yaml                    |  20 +++----
 10 files changed, 61 insertions(+), 194 deletions(-)
 delete mode 100644 alpine/3.14/Dockerfile
 delete mode 100644 alpine/uptodate.yaml
 delete mode 100644 img/rse-ops-docker.png
 delete mode 100755 scripts/set-up-spack.sh
 rename scripts/ubuntu/{apt-install-defaults-plus-args.sh => setup.sh} (67%)
 delete mode 100644 ubuntu/23.04/Dockerfile
 delete mode 100644 ubuntu/24.04/Dockerfile

diff --git a/alpine/3.14/Dockerfile b/alpine/3.14/Dockerfile
deleted file mode 100644
index a2a5413..0000000
--- a/alpine/3.14/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM alpine:3.14@sha256:0f2d5c38dd7a4f4f733e688e3a6733cb5ab1ac6e3cb4603a5dd564e5bfb80eed
-
-LABEL maintainer="@vsoch"
-
-ENV TZ=America/Los_Angeles
-
-RUN apk update && \
-    apk add git python3 clingo \
-        g++ \
-        bash \
-        make \ 
-        patch \
-        linux-headers && \
-    ln -sf python3 /usr/bin/python && \
-    python3 -m ensurepip && \
-    pip3 install --no-cache --upgrade pip setuptools
-
-# Install spack
-RUN git clone --depth 1 https://github.com/spack/spack /opt/spack
-ENV PATH=/opt/spack/bin:$PATH
-
-# Find packages already installed on system, e.g. autoconf
-RUN spack external find # && \
-# commented out to make build faster for debugging, will uncomment
-#    spack install cmake@3.20.4
diff --git a/alpine/uptodate.yaml b/alpine/uptodate.yaml
deleted file mode 100644
index b4e5b74..0000000
--- a/alpine/uptodate.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-dockerhierarchy:
-  container:
-    name: alpine
-    filter: 
-     # we only want XX.14 versions
-     - "^[0-9]+[.]14$"
-    startat: "3.14"
diff --git a/img/rse-ops-docker.png b/img/rse-ops-docker.png
deleted file mode 100644
index 735b3882dc5b1024d7b5cd5cdfbd471b70f28d51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13056
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

diff --git a/scripts/set-up-spack.sh b/scripts/set-up-spack.sh
deleted file mode 100755
index 3c02df3..0000000
--- a/scripts/set-up-spack.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-set -x
-pushd /opt
-
-git clone https://github.com/spack/spack spack
-pushd spack
-git reset --hard ${spack_commit}
-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
-
-# Find packages already installed on system, e.g. autoconf
-# IMPORTANT: ensure that all binaries installed include their development files
-#            failure to do this will get them detected, and kill builds with
-#            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
-# configure spack
-# build for the generic target
-spack config add 'packages:all:target:[x86_64]'
-# reuse as much as possible, make externals useful
-spack config add 'concretizer:reuse:true'
-# Generate spack environment for packages
-spack env create --dir /opt/env --with-view /opt/view
-
-# ensure clangs and others that don't inject rpaths make working executables
-cat >/etc/ld.so.conf.d/spack_view.conf <<EOF
-/opt/view/lib
-/opt/view/lib64
-EOF
-ldconfig
-
-popd
diff --git a/scripts/ubuntu/apt-install-defaults-plus-args.sh b/scripts/ubuntu/setup.sh
similarity index 67%
rename from scripts/ubuntu/apt-install-defaults-plus-args.sh
rename to scripts/ubuntu/setup.sh
index cf178d1..7271580 100755
--- a/scripts/ubuntu/apt-install-defaults-plus-args.sh
+++ b/scripts/ubuntu/setup.sh
@@ -1,43 +1,50 @@
 #!/bin/bash
 set -euo pipefail
 set -x
+
 packages=(
-  # fetchers
+  binutils-dev
+  build-essential
+  bzip2
   ca-certificates
   curl
-  git
-  wget
-  # interactive tools
-  valgrind
-  vim-nox
-  # build stuff
-  build-essential
   dh-autoreconf
+  git
   gnupg2
+  hwloc-nox
+  lbzip2
   lcov
+  libbinutils
+  libbz2-dev
+  libhwloc-dev
+  liblzma-dev
+  libssl-dev
+  libzip-dev
   meson
   ninja-build
   pkg-config
   python3
-  python3-pip
   python3-dev
+  python3-pip
   sudo
-  xsltproc
-  # common build deps
-  libbinutils
-  binutils-dev
-  hwloc-nox
-  libhwloc-dev
-  libssl-dev
-  lbzip2
-  libbz2-dev
-  libzip-dev
-  liblzma-dev
-  bzip2
   unzip
+  vim-nox
+  wget
+  xsltproc
 )
+
 apt-get -qq update
 apt-get -qq install -fy tzdata
 apt-get -qq install -y --no-install-recommends "${packages[@]}" "$@"
 rm -rf /var/lib/apt/lists/*
 apt-get clean
+
+# Install Clingo for Spack
+python3 -m pip install --upgrade pip
+python3 -m pip install clingo
+
+# Setup radiuss user
+useradd -ms /bin/bash radiuss
+printf "radiuss:radiuss" | chpasswd
+adduser radiuss sudo
+printf "radiuss ALL= NOPASSWD: ALL\\n" >> /etc/sudoers
diff --git a/ubuntu/20.04/Dockerfile b/ubuntu/20.04/Dockerfile
index afa72f9..bc65a66 100644
--- a/ubuntu/20.04/Dockerfile
+++ b/ubuntu/20.04/Dockerfile
@@ -1,25 +1,12 @@
 FROM ubuntu:20.04@sha256:f5c3e53367f142fab0b49908550bdcdc4fb619d2f61ec1dfa60d26e0d59ac9e7
 
-LABEL maintainer="Chris White <white238@llnl.gov>,@vsoch"
+LABEL maintainer="Chris White <white238@llnl.gov>,@vsoch,David Beckingsale <beckingsale1@llnl.gov>"
 
-ARG uptodate_github_commit_spack__spack__develop=5351382501e280838d148f15dfd485f2a78667f2
-ENV spack_commit=${uptodate_github_commit_spack__spack__develop}
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/Los_Angeles
 
-# Add appropriate paths pointing to the view
-ENV PATH=/opt/view/bin:/opt/spack/bin:$PATH \
-    MANPATH=/opt/view/share/man:$MANPATH \
-    PKG_CONFIG_PATH=/opt/view/lib/pkgconfig:/opt/view/lib64/pkgconfig:/opt/view/share/pkgconfig:$PKG_CONFIG_PATH \
-    CMAKE_PREFIX_PATH=/opt/view \
-    ACLOCAL_PATH=/opt/view/share/aclocal
-
 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
+
+RUN ./scripts/ubuntu/setup.sh && \
+    ./scripts/install-cmake-binary.sh
\ No newline at end of file
diff --git a/ubuntu/23.04/Dockerfile b/ubuntu/23.04/Dockerfile
deleted file mode 100644
index 43ef034..0000000
--- a/ubuntu/23.04/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM ubuntu:22.04@sha256:8eab65df33a6de2844c9aefd19efe8ddb87b7df5e9185a4ab73af936225685bb
-
-LABEL maintainer="@vsoch"
-
-ARG uptodate_github_commit_spack__spack__develop=5351382501e280838d148f15dfd485f2a78667f2
-ENV spack_commit=${uptodate_github_commit_spack__spack__develop}
-ENV DEBIAN_FRONTEND=noninteractive
-ENV TZ=America/Los_Angeles
-
-# Add appropriate paths pointing to the view
-ENV PATH=/opt/view/bin:/opt/spack/bin:$PATH \
-    MANPATH=/opt/view/share/man:$MANPATH \
-    PKG_CONFIG_PATH=/opt/view/lib/pkgconfig:/opt/view/lib64/pkgconfig:/opt/view/share/pkgconfig:$PKG_CONFIG_PATH \
-    CMAKE_PREFIX_PATH=/opt/view \
-    ACLOCAL_PATH=/opt/view/share/aclocal
-
-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
diff --git a/ubuntu/24.04/Dockerfile b/ubuntu/24.04/Dockerfile
deleted file mode 100644
index 43ef034..0000000
--- a/ubuntu/24.04/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM ubuntu:22.04@sha256:8eab65df33a6de2844c9aefd19efe8ddb87b7df5e9185a4ab73af936225685bb
-
-LABEL maintainer="@vsoch"
-
-ARG uptodate_github_commit_spack__spack__develop=5351382501e280838d148f15dfd485f2a78667f2
-ENV spack_commit=${uptodate_github_commit_spack__spack__develop}
-ENV DEBIAN_FRONTEND=noninteractive
-ENV TZ=America/Los_Angeles
-
-# Add appropriate paths pointing to the view
-ENV PATH=/opt/view/bin:/opt/spack/bin:$PATH \
-    MANPATH=/opt/view/share/man:$MANPATH \
-    PKG_CONFIG_PATH=/opt/view/lib/pkgconfig:/opt/view/lib64/pkgconfig:/opt/view/share/pkgconfig:$PKG_CONFIG_PATH \
-    CMAKE_PREFIX_PATH=/opt/view \
-    ACLOCAL_PATH=/opt/view/share/aclocal
-
-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
diff --git a/ubuntu/clang/Dockerfile b/ubuntu/clang/Dockerfile
index 3f650ba..9943e4b 100644
--- a/ubuntu/clang/Dockerfile
+++ b/ubuntu/clang/Dockerfile
@@ -1,28 +1,23 @@
 ARG ubuntu_version
-FROM ghcr.io/rse-ops/ubuntu:$ubuntu_version
+# FROM ghcr.io/llnl/ubuntu:$ubuntu_version
+FROM ubuntu-base
 
 # Install llvm with spack
-ARG llvm_version
-ENV llvm_version=$llvm_version
-ENV llvm_spec="llvm@${llvm_version}+llvm_dylib+link_llvm_dylib~split_dwarf~lldb~polly build_type=MinSizeRel" \
-    # these are safe here only because spack ignores them
-    COMPILER_NAME=clang \
-    COMPILER_VERSION=$llvm_version \
-    CC=/opt/view/bin/clang \
-    CXX=/opt/view/bin/clang++ \
-    CPP=/opt/view/bin/clang-cpp
+# ARG llvm_version
+ENV llvm_version=12
 
-# 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 \
- && 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 \
- && update-alternatives --install /usr/bin/c99 c99 ${CC} 50
+RUN \
+    sudo apt-get -qq update \
+    && sudo apt-get -qq install -y --no-install-recommends \
+        clang-${llvm_version} clang-format-${llvm_version} llvm-${llvm_version} \
+    && sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${llvm_version} 100 \
+    && sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${llvm_version} 100 \
+    && sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${llvm_version} 100 \
+    && sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${llvm_version} 100 \
+    && sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${llvm_version} 100 \
+    && sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${llvm_version} 100 \
+    && sudo rm -rf /var/lib/apt/lists/* \
+    && sudo apt-get clean
+    
+USER radiuss
+WORKDIR /home/radiuss
\ No newline at end of file
diff --git a/ubuntu/clang/uptodate.yaml b/ubuntu/clang/uptodate.yaml
index e3f92ae..0e6bcfc 100644
--- a/ubuntu/clang/uptodate.yaml
+++ b/ubuntu/clang/uptodate.yaml
@@ -3,24 +3,24 @@ dockerbuild:
   # Specific combinations of build args to exclude (optional)
   # Spack doesn't work with 14 nor 15
   exclude:
-    llvm_version: ["14.0.0", "15.0.0"]
+    llvm_version: ["14", "15"]
     ubuntu_version: ["20.04", "20.04"]
 
   build_args:
     llvm_version:
       key: llvm
-      name: llvm
-      type: spack
-
-      # Only install x.0.0 versions
-      filter: 
-        - "^[0-9]+[.]0[.]0$"
-
-      # Greater than 10.0.0
-      startat: "10.0.0"
+      versions:
+        - "10"
+        - "11"
+        - "12"
+        - "13"
+        - "14"
+        - "15"
+        - "16"
 
     # Only support those in spack build cache
     ubuntu_version:
       key: ubuntu
       versions:
         - "20.04"
+        - "22.04"