From 827f85ccba532818a23c3fb552b3d668e43dbca7 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Thu, 30 Nov 2023 14:48:31 +0100
Subject: [PATCH] chore: simplify devcontainer (#26058)
---
.devcontainer/Dockerfile | 14 +-------------
.devcontainer/devcontainer.json | 15 ++++++++-------
.devcontainer/post-create.sh | 4 +---
3 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index f6dbe4e144..64c0ef09d2 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,13 +1 @@
-FROM ghcr.io/containerbase/node:20.10.0
-
-USER root
-
-RUN install-apt make g++
-
-# renovate: datasource=github-releases packageName=containerbase/python-prebuild
-RUN install-tool python 3.12.0
-
-# renovate: datasource=npm
-RUN install-tool corepack 0.23.0
-
-USER ubuntu
+FROM ghcr.io/containerbase/devcontainer:9.26.0
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 39abc2882f..b9834638de 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,13 +1,8 @@
{
- "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json",
"name": "Renovate",
- "dockerFile": "Dockerfile",
- "features": {
- "ghcr.io/devcontainers/features/common-utils:2": {}
+ "build": {
+ "dockerfile": "Dockerfile"
},
- "capAdd": ["SYS_PTRACE"],
- "privileged": true,
- "securityOpt": ["seccomp=unconfined"],
"hostRequirements": {
"cpus": 4,
"memory": "7gb",
@@ -15,6 +10,12 @@
},
"customizations": {
"vscode": {
+ "terminal.integrated.profiles.linux": {
+ "bash": {
+ "path": "bash",
+ "icon": "terminal-bash"
+ }
+ },
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
index f4e46a525b..cdca067449 100755
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -7,6 +7,4 @@ if [[ "${CODESPACES}" == true ]]; then
sudo chmod 1777 /tmp
fi
-set -x
-
-exec pnpm install
+pnpm install
--
GitLab