From 3e607a4b1fbf98fa64cf8088134a076c079db009 Mon Sep 17 00:00:00 2001
From: Andrejus <git@andrejus.uk>
Date: Fri, 8 Mar 2024 12:03:53 +0000
Subject: [PATCH] feat: bookworm image, docker tests pass

---
 Dockerfile                       |  2 +-
 script/install.d/25-terraform.sh | 13 +++++++++----
 tests/test_binaries.py           |  7 +++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5b315c9..9f3fb01 100644
--- a/Dockerfile
+++ b/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
diff --git a/script/install.d/25-terraform.sh b/script/install.d/25-terraform.sh
index 6c0a727..a13caeb 100644
--- a/script/install.d/25-terraform.sh
+++ b/script/install.d/25-terraform.sh
@@ -7,10 +7,15 @@
 
 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 &&
-            sudo apt-get update -qq &&
+        # 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
         brew tap hashicorp/tap
diff --git a/tests/test_binaries.py b/tests/test_binaries.py
index b482f46..458904e 100644
--- a/tests/test_binaries.py
+++ b/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]
+
 
 
 # --------------------------------------------------------------------------- #