From 948b9a822c737c43e4030c8daac6d24f3f6924c2 Mon Sep 17 00:00:00 2001
From: Felipe Santos <felipecassiors@gmail.com>
Date: Sat, 15 Jul 2023 11:37:51 -0300
Subject: [PATCH] chore: improve devcontainer (#23378)
---
.devcontainer/Dockerfile | 2 ++
.devcontainer/devcontainer.json | 13 ++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 22b0f46db9..3b1a2db9ca 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -9,3 +9,5 @@ RUN install-tool python 3.11.4
# renovate: datasource=npm
RUN install-tool yarn 1.22.19
+
+USER ubuntu
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6daf80c694..18e2fb4bf1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,14 +7,11 @@
},
"name": "Renovate",
"dockerFile": "Dockerfile",
+ "features": {
+ "ghcr.io/devcontainers/features/common-utils:2": {}
+ },
"customizations": {
"vscode": {
- "settings": {
- "terminal.integrated.profiles.linux": {
- "bash": { "path": "/bin/bash" }
- },
- "terminal.integrated.defaultProfile.linux": "bash"
- },
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
@@ -30,5 +27,7 @@
"seccomp=unconfined",
"--privileged"
],
- "postCreateCommand": "yarn install"
+ "postCreateCommand": "yarn install",
+ // Otherwise jest watcher fails because deps were not installed yet
+ "waitFor": "postCreateCommand"
}
--
GitLab