From 508ea65fae8cbe76c4d6540b8da0865e1154486f Mon Sep 17 00:00:00 2001 From: Josh Arrington <2245544+josharrington@users.noreply.github.com> Date: Fri, 7 Feb 2025 05:55:10 +0000 Subject: [PATCH 1/2] [chore] Ensure dev_deploy is run with bash --- dev_deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev_deploy.sh b/dev_deploy.sh index a106395b..d7794842 100755 --- a/dev_deploy.sh +++ b/dev_deploy.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Exit immediately if a command exits with a non-zero status set -e From 87f36167f38aedce4669d2e5a2ff3c49d70c4370 Mon Sep 17 00:00:00 2001 From: Josh Arrington <2245544+josharrington@users.noreply.github.com> Date: Fri, 7 Feb 2025 05:55:44 +0000 Subject: [PATCH 2/2] Separate Podman devcontainer config with SELinux support --- .devcontainer/{ => default}/devcontainer.json | 2 +- .devcontainer/podman/devcontainer.json | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) rename .devcontainer/{ => default}/devcontainer.json (88%) create mode 100644 .devcontainer/podman/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/default/devcontainer.json similarity index 88% rename from .devcontainer/devcontainer.json rename to .devcontainer/default/devcontainer.json index e96e24bf..c195fd57 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/default/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "JetKVM", + "name": "JetKVM Default", "image": "mcr.microsoft.com/devcontainers/go:1-1.23-bookworm", "features": { "ghcr.io/devcontainers/features/node:1": { diff --git a/.devcontainer/podman/devcontainer.json b/.devcontainer/podman/devcontainer.json new file mode 100644 index 00000000..9419b6a8 --- /dev/null +++ b/.devcontainer/podman/devcontainer.json @@ -0,0 +1,19 @@ +{ + "name": "JetKVM Podman", + "image": "mcr.microsoft.com/devcontainers/go:1-1.23-bookworm", + "features": { + "ghcr.io/devcontainers/features/node:1": { + // Should match what is defined in ui/package.json + "version": "21.1.0" + } + }, + "runArgs": [ + "--userns=keep-id", + "--security-opt=label=disable", + "--security-opt=label=nested" + ], + "containerUser": "vscode", + "containerEnv": { + "HOME": "/home/vscode" + } +} \ No newline at end of file