From bfe7cfb681a4d0c52e144666677e4f78f30f1940 Mon Sep 17 00:00:00 2001
From: Nicolas Bock <nicolasbock@gmail.com>
Date: Tue, 8 Feb 2022 13:14:50 -0700
Subject: [PATCH 1/2] Replace deprecated `apt-key` command

The `apt-key` command is deprecated after Ubuntu 22.04. To get an early start,
this change replaces `apt-key` with the recommended alternative.

Signed-off-by: Nicolas Bock <nicolasbock@gmail.com>
---
 scripts/prepare-container-focal.sh | 10 +++++++---
 scripts/prepare-container.sh       | 13 +++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/scripts/prepare-container-focal.sh b/scripts/prepare-container-focal.sh
index bf4c5d150..9f74e87bc 100755
--- a/scripts/prepare-container-focal.sh
+++ b/scripts/prepare-container-focal.sh
@@ -25,21 +25,25 @@ deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main
 deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main
 # deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main
 EOF
-wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | ${SUDO} apt-key add -
+${SUDO} cat > /etc/apt/trusted.gpg.d/llvm.gpg < <(wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor)
 
 cat <<EOF | ${SUDO} tee /etc/apt/sources.list.d/toolchain.list
 deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main
 # deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main
 EOF
-${SUDO} apt-key adv --keyserver keyserver.ubuntu.com \
+gpg --keyserver keyserver.ubuntu.com \
   --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F
+${SUDO} cat > /etc/apt/trusted.gpg.d/toolchain.gpg < <(gpg --export 60C317803A41BA51845E371A1E9377A2BA9EF27F)
 
 cat <<EOF | ${SUDO} tee /etc/apt/sources.list.d/emacs.list
 deb http://ppa.launchpad.net/kelleyk/emacs/ubuntu focal main
 # deb-src http://ppa.launchpad.net/kelleyk/emacs/ubuntu focal main
 EOF
-${SUDO} apt-key adv --keyserver keyserver.ubuntu.com \
+gpg --keyserver keyserver.ubuntu.com \
   --recv-keys 873503A090750CDAEB0754D93FF0E01EEAAFC9CD
+${SUDO} cat > /etc/apt/trusted.gpg.d/emacs.gpg < <(gpg --export 873503A090750CDAEB0754D93FF0E01EEAAFC9CD)
+
+apt-key list
 
 for i in $(seq 5); do
   ${SUDO} apt-get update && break
diff --git a/scripts/prepare-container.sh b/scripts/prepare-container.sh
index 0bc92cf88..0451d248f 100755
--- a/scripts/prepare-container.sh
+++ b/scripts/prepare-container.sh
@@ -25,28 +25,33 @@ deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main
 deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main
 # deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main
 EOF
-wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | ${SUDO} apt-key add -
+${SUDO} bash -c "cat > /etc/apt/trusted.gpg.d/llvm.gpg" < <(wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor)
 
 cat <<EOF | ${SUDO} tee /etc/apt/sources.list.d/cmake.list
 deb http://ppa.launchpad.net/janisozaur/cmake-update-bionic/ubuntu bionic main
 # deb-src http://ppa.launchpad.net/janisozaur/cmake-update-bionic/ubuntu bionic main
 EOF
-${SUDO} apt-key adv --keyserver keyserver.ubuntu.com \
+gpg --keyserver keyserver.ubuntu.com \
   --recv-keys DBA92F17B25AD78F9F2D9F713DEC686D130FF5E4
+${SUDO} bash -c "cat > /etc/apt/trusted.gpg.d/cmake.gpg" < <(gpg --export DBA92F17B25AD78F9F2D9F713DEC686D130FF5E4)
 
 cat <<EOF | ${SUDO} tee /etc/apt/sources.list.d/toolchain.list
 deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu bionic main
 # deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu bionic main
 EOF
-${SUDO} apt-key adv --keyserver keyserver.ubuntu.com \
+gpg --keyserver keyserver.ubuntu.com \
   --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F
+${SUDO} bash -c "cat > /etc/apt/trusted.gpg.d/toolchain.gpg" < <(gpg --export 60C317803A41BA51845E371A1E9377A2BA9EF27F)
 
 cat <<EOF | ${SUDO} tee /etc/apt/sources.list.d/emacs.list
 deb http://ppa.launchpad.net/kelleyk/emacs/ubuntu bionic main
 # deb-src http://ppa.launchpad.net/kelleyk/emacs/ubuntu bionic main
 EOF
-${SUDO} apt-key adv --keyserver keyserver.ubuntu.com \
+gpg --keyserver keyserver.ubuntu.com \
   --recv-keys 873503A090750CDAEB0754D93FF0E01EEAAFC9CD
+${SUDO} bash -c "cat > /etc/apt/trusted.gpg.d/emacs.gpg" < <(gpg --export 873503A090750CDAEB0754D93FF0E01EEAAFC9CD)
+
+apt-key list
 
 for i in $(seq 5); do
   ${SUDO} apt-get update && break

From c49be39c0ab2b08cf96a14197b9ebb4a5b13f478 Mon Sep 17 00:00:00 2001
From: Nicolas Bock <nicolasbock@gmail.com>
Date: Tue, 8 Feb 2022 13:21:53 -0700
Subject: [PATCH 2/2] Remove Hirsute and Impish containers

We will eventually switch to Jammy instead as Hirsute and Impish are short lived
releases.

Signed-off-by: Nicolas Bock <nicolasbock@gmail.com>
---
 .github/workflows/container.yaml     | 48 -------------------
 scripts/prepare-container-hirsute.sh | 70 ----------------------------
 scripts/prepare-container-impish.sh  | 70 ----------------------------
 3 files changed, 188 deletions(-)
 delete mode 100755 scripts/prepare-container-hirsute.sh
 delete mode 100755 scripts/prepare-container-impish.sh

diff --git a/.github/workflows/container.yaml b/.github/workflows/container.yaml
index 63bf6b40a..4856a71dd 100644
--- a/.github/workflows/container.yaml
+++ b/.github/workflows/container.yaml
@@ -59,51 +59,3 @@ jobs:
       - name: Image digest
         run: |
           echo "Focal image: ${{ steps.docker_build_focal.outputs.digest }}"
-
-  hirsute_container:
-    name: Update Hirsute CI container image
-    runs-on: ubuntu-latest
-    if: ${{ github.repository == 'lanl/bml' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push experimental Hirsute Docker image
-        uses: docker/build-push-action@v2
-        id: docker_build_hirsute
-        with:
-          context: .
-          file: Dockerfile-hirsute
-          push: true
-          tags: nicolasbock/bml:hirsute
-      - name: Image digest
-        run: |
-          echo "Hirsute image: ${{ steps.docker_build_hirsute.outputs.digest }}"
-
-  impish_container:
-    name: Update Impish CI container image
-    runs-on: ubuntu-latest
-    if: ${{ github.repository == 'lanl/bml' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push experimental Impish Docker image
-        uses: docker/build-push-action@v2
-        id: docker_build_impish
-        with:
-          context: .
-          file: Dockerfile-impish
-          push: true
-          tags: nicolasbock/bml:impish
-      - name: Image digest
-        run: |
-          echo "Impish image: ${{ steps.docker_build_impish.outputs.digest }}"
diff --git a/scripts/prepare-container-hirsute.sh b/scripts/prepare-container-hirsute.sh
deleted file mode 100755
index 49c9569d1..000000000
--- a/scripts/prepare-container-hirsute.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-set -e -u -x
-
-SUDO=$(which sudo || true)
-
-for i in $(seq 5); do
-  ${SUDO} apt-get update && break
-done
-
-${SUDO} apt-get install --assume-yes --no-install-recommends \
-  apt-transport-https \
-  ca-certificates \
-  gnupg \
-  wget
-
-cat <<EOF | ${SUDO} tee /etc/apt/sources.list.d/clang.list
-# i386 not available
-deb http://apt.llvm.org/hirsute/ llvm-toolchain-hirsute main
-# deb-src http://apt.llvm.org/hirsute/ llvm-toolchain-hirsute main
-# 11
-deb http://apt.llvm.org/hirsute/ llvm-toolchain-hirsute-11 main
-# deb-src http://apt.llvm.org/hirsute/ llvm-toolchain-hirsute-11 main
-# 12
-deb http://apt.llvm.org/hirsute/ llvm-toolchain-hirsute-12 main
-# deb-src http://apt.llvm.org/hirsute/ llvm-toolchain-hirsute-12 main
-EOF
-wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | ${SUDO} apt-key add -
-
-cat <<EOF | ${SUDO} tee /etc/apt/sources.list.d/toolchain.list
-deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu hirsute main
-# deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu hirsute main
-EOF
-${SUDO} apt-key adv --keyserver keyserver.ubuntu.com \
-  --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F
-
-for i in $(seq 5); do
-  ${SUDO} apt-get update && break
-done
-
-${SUDO} ln -fs /usr/share/zoneinfo/UTC /etc/localtime
-${SUDO} apt-get install --assume-yes tzdata
-DEBIAN_FRONTEND=noninteractive ${SUDO} dpkg-reconfigure \
-  --frontend noninteractive tzdata
-
-${SUDO} apt-get install --assume-yes --no-install-recommends \
-  apt-utils \
-  build-essential \
-  gfortran \
-  bundler \
-  cmake cmake-data \
-  emacs \
-  clang-9 llvm-9-dev libomp-9-dev \
-  gcc-9 g++-9 gfortran-9 \
-  gcc-10 g++-10 gfortran-10 \
-  gcc-11 g++-11 gfortran-11 \
-  git-core \
-  indent \
-  libblas-dev liblapack-dev \
-  libscalapack-openmpi-dev \
-  mpi-default-dev \
-  openmpi-bin \
-  openssh-client \
-  python python3-pip python3-wheel python3-pkg-resources \
-  sudo \
-  texlive \
-  valgrind \
-  vim
-
-${SUDO} pip install --system bashate
diff --git a/scripts/prepare-container-impish.sh b/scripts/prepare-container-impish.sh
deleted file mode 100755
index f4e8e88fa..000000000
--- a/scripts/prepare-container-impish.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-set -e -u -x
-
-SUDO=$(which sudo || true)
-
-for i in $(seq 5); do
-  ${SUDO} apt-get update && break
-done
-
-${SUDO} apt-get install --assume-yes --no-install-recommends \
-  apt-transport-https \
-  ca-certificates \
-  gnupg \
-  wget
-
-cat <<EOF | ${SUDO} tee /etc/apt/sources.list.d/clang.list
-# i386 not available
-deb http://apt.llvm.org/impish/ llvm-toolchain-impish main
-# deb-src http://apt.llvm.org/impish/ llvm-toolchain-impish main
-# 11
-deb http://apt.llvm.org/impish/ llvm-toolchain-impish-11 main
-# deb-src http://apt.llvm.org/impish/ llvm-toolchain-impish-11 main
-# 12
-deb http://apt.llvm.org/impish/ llvm-toolchain-impish-12 main
-# deb-src http://apt.llvm.org/impish/ llvm-toolchain-impish-12 main
-EOF
-wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | ${SUDO} apt-key add -
-
-cat <<EOF | ${SUDO} tee /etc/apt/sources.list.d/toolchain.list
-deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu impish main
-# deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu impish main
-EOF
-${SUDO} apt-key adv --keyserver keyserver.ubuntu.com \
-  --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F
-
-for i in $(seq 5); do
-  ${SUDO} apt-get update && break
-done
-
-${SUDO} ln -fs /usr/share/zoneinfo/UTC /etc/localtime
-${SUDO} apt-get install --assume-yes tzdata
-DEBIAN_FRONTEND=noninteractive ${SUDO} dpkg-reconfigure \
-  --frontend noninteractive tzdata
-
-${SUDO} apt-get install --assume-yes --no-install-recommends \
-  apt-utils \
-  build-essential \
-  gfortran \
-  bundler \
-  cmake cmake-data \
-  emacs \
-  clang-9 llvm-9-dev libomp-9-dev \
-  gcc-9 g++-9 gfortran-9 \
-  gcc-10 g++-10 gfortran-10 \
-  gcc-11 g++-11 gfortran-11 \
-  git-core \
-  indent \
-  libblas-dev liblapack-dev \
-  libscalapack-openmpi-dev \
-  mpi-default-dev \
-  openmpi-bin \
-  openssh-client \
-  python python3-pip python3-wheel python3-pkg-resources \
-  sudo \
-  texlive \
-  valgrind \
-  vim
-
-${SUDO} pip install --system bashate