From a78ee4ffe77ad68a2b6e677446853bef3b086584 Mon Sep 17 00:00:00 2001
From: stephenandary <stephen@jamminmusic.com>
Date: Mon, 1 May 2023 14:12:08 -0400
Subject: [PATCH] WIP - Update devcontainer to use debian bookworm

---
 .devcontainer/Dockerfile                          |  9 +++++++++
 .devcontainer/devcontainer.json                   | 15 ++++++++++++---
 .../linux/devcontainer-feature.json               |  4 ----
 .devcontainer/local-features/linux/install.sh     |  6 ------
 4 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 .devcontainer/Dockerfile
 delete mode 100644 .devcontainer/local-features/linux/devcontainer-feature.json
 delete mode 100644 .devcontainer/local-features/linux/install.sh

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 000000000..b20e962b9
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,9 @@
+# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye
+ARG VARIANT="slim-bookworm"
+FROM rust:${VARIANT}
+ENV DEBIAN_FRONTEND noninteractive
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -qq install build-essential libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1c5278332..aa536ab53 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,9 +1,18 @@
 {
     "name": "dioxus",
-    "image": "mcr.microsoft.com/devcontainers/rust:latest",
+    "remoteUser": "vscode",
+    "build": {
+        "dockerfile": "./Dockerfile",
+        "context": "."
+    },
     "features": {
-        "ghcr.io/devcontainers/features/common-utils:2": {},
-        "./local-features/linux": {}
+        "ghcr.io/devcontainers/features/common-utils:2": {
+            "installZsh": "true",
+            "username": "vscode",
+            "uid": "1000",
+            "gid": "1000",
+            "upgradePackages": "true"
+        }
     },
     "containerEnv": {
         "RUST_LOG": "INFO"
diff --git a/.devcontainer/local-features/linux/devcontainer-feature.json b/.devcontainer/local-features/linux/devcontainer-feature.json
deleted file mode 100644
index daba5bc1f..000000000
--- a/.devcontainer/local-features/linux/devcontainer-feature.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "id": "linux",
-    "version": "0.0.1"
-}
\ No newline at end of file
diff --git a/.devcontainer/local-features/linux/install.sh b/.devcontainer/local-features/linux/install.sh
deleted file mode 100644
index 8f9ad5e1a..000000000
--- a/.devcontainer/local-features/linux/install.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-echo "Update Apt Database"
-sudo apt-get update
-
-echo "Install Webkit Dependencies"
-sudo apt-get -qq install build-essential libwebkit2gtk-4.0-dev libgtk-3-dev libayatana-appindicator3-dev