feat: bookworm image, docker tests pass

Dockerfile

@@ -1,7 +1,7 @@
 #
 # debian-base: Base Debian image with sudo user
 #
-FROM debian:trixie-slim AS base
+FROM debian:bookworm-slim AS base
 
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 ENV DEBIAN_FRONTEND noninteractive

script/install.d/25-terraform.sh

@@ -7,9 +7,14 @@
 
 if ! command -v "terraform" &>/dev/null; then
     if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-        wget -qO- https://apt.releases.hashicorp.com/gpg | sudo tee /etc/apt/keyrings/hashicorp-keyring.gpg >/dev/null &&
-            sudo chmod go+r /etc/apt/keyrings/hashicorp-keyring.gpg &&
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/hashicorp-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list >/dev/null &&
+        # https://developer.hashicorp.com/terraform/tutorials/aws-get-started/install-cli#install-terraform
+        wget -O- https://apt.releases.hashicorp.com/gpg |
+            gpg --dearmor |
+            sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg >/dev/null
+
+        echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] \
+            https://apt.releases.hashicorp.com $(lsb_release -cs) main" |
+            sudo tee /etc/apt/sources.list.d/hashicorp.list
         sudo apt-get update -qq &&
             sudo apt-get install -qq terraform
     elif [[ "$OSTYPE" == "darwin"* ]]; then

tests/test_binaries.py

@@ -49,7 +49,7 @@ binaries: List[Text] = [
     "gh",
     "terraform",
     "docker" if not os.environ.get("SKIP_DOCKER_CONFIG") else None,
-    "screenfetch",
+    "neofetch",
 
     # language: python
     "pyenv",
@@ -63,10 +63,9 @@ binaries: List[Text] = [
     "node",
     "npm",
     "yarn",
-
-    # language: java
-    "java",
 ]
+binaries = [binary for binary in binaries if binary is not None]
+
 
 
 # --------------------------------------------------------------------------- #