From 15534e1f951f655e81aa3bf1b0f202d262c1b16a Mon Sep 17 00:00:00 2001
From: Christian Stewart <christian@aperture.us>
Date: Sun, 16 Jul 2023 21:49:02 -0700
Subject: [PATCH] skiff/core: use debian bookworm and other improvements

Signed-off-by: Christian Stewart <christian@aperture.us>
---
 .../skiff-core-defconfig/coreenv/Dockerfile   | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/configs/skiff/core/buildroot_ext/package/skiff-core-defconfig/coreenv/Dockerfile b/configs/skiff/core/buildroot_ext/package/skiff-core-defconfig/coreenv/Dockerfile
index 110de1094..81253d62b 100644
--- a/configs/skiff/core/buildroot_ext/package/skiff-core-defconfig/coreenv/Dockerfile
+++ b/configs/skiff/core/buildroot_ext/package/skiff-core-defconfig/coreenv/Dockerfile
@@ -1,5 +1,5 @@
 ARG DISTRO
-FROM ${DISTRO:-debian:sid} as stage1
+FROM ${DISTRO:-debian:bookworm} as stage1
 
 # setup environment
 ENV LANG=C.UTF-8 \
@@ -19,12 +19,16 @@ RUN \
     --ignore-missing \
     -o "Dpkg::Options::=--force-confdef"  \
     -o "Dpkg::Options::=--force-confnew"  \
+    accountsservice \
     autotools-dev \
     build-essential \
     chromium \
     cups \
     curl \
     git \
+    gnupg \
+    gnupg-utils \
+    gpg-agent \
     htop \
     less \
     lightdm \
@@ -35,6 +39,9 @@ RUN \
     ncurses-term \
     net-tools \
     openssh-client \
+    python3-keyring \
+    python3-secretstorage \
+    python3-launchpadlib \
     rsync \
     software-properties-common \
     sudo \
@@ -52,16 +59,20 @@ RUN \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/*
 
-# ensure default locale is generated
-RUN locale-gen "en_US.UTF-8"
+# ensure en_US locales are generated
+RUN sed -i 's/^#\(.*en_US.*\)/\1/' /etc/locale.gen && \
+    locale-gen "en_US.UTF-8"
+
+# force Chromium to use the GPU
+printf \
+    "# Ignore the GPU blocklist and use GPU rendering.\nexport CHROMIUM_FLAGS=\"$CHROMIUM_FLAGS --ignore-gpu-blocklist\"\n" >\
+      /etc/chromium.d/ignore-gpu-blocklist
 
 # flatten image
 FROM scratch as stage2
 
 COPY --from=stage1 / /
 
-# Note: this section identical to skiff-core-defconfig
-
 ENV container=docker \
   LANG=en_US.UTF-8 \
   LANGUAGE=en_US:en \