Devcontainer maintanence (demisto#29299)

ilaner · web-flow · commit 480fb703a281 · 2023-09-06T12:52:13.000+03:00
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -14,9 +14,9 @@ RUN apt-get update && apt-get install dos2unix git python2 curl -y \
     && rm -rf /features \
     && git clone https://github.com/devcontainers/features.git /features \
     && cd /features \
-    # locking to the latest master commit in this repo to prevent breaking changes
+    # locking to the latest master commit in this repo (https://github.com/devcontainers/features.git) to prevent breaking changes
     # We should update this commit hash from time to time to
-    && git checkout 1869e5931cfe0517f75d58cb70863a6b4874c487
+    && git checkout 96bff0097028001e6e4126c5528d37cb8c13e785
 
 # This is a workaround for VSCode devcontainer features in self signed certificate
 RUN UID="1000" GID="1000" bash /features/src/common-utils/install.sh
diff --git a/.devcontainer/createCommand.sh b/.devcontainer/createCommand.sh
@@ -4,9 +4,9 @@ set -e
 
 echo "Fixing permissions"
 
-sudo chown demisto .venv
-sudo chown demisto node_modules
-sudo chown demisto /workspaces
+sudo chown demisto /workspaces /workspaces/content
+sudo chown -R demisto /workspaces/content/.vscode /workspaces/content/.git /workspaces/content/.venv /workspaces/content/node_modules /workspaces/content/package-lock.json
+
 sudo chown -R demisto $HOME
 
 echo "Setting up VSCode paths"
@@ -19,5 +19,11 @@ rm -f .env
 echo "PYTHONPATH=""$path"":$PYTHONPATH" >> .env
 echo "MYPYPATH=""$path"":$MYPYPATH" >> .env
 
+echo "Setting up git safe directory"
+git config --global --add safe.directory /workspaces/content
+
 echo "Setting up content dependencies"
-.hooks/bootstrap
+.hooks/bootstrap
+
+echo "Run demisto-sdk pre-commit to cache dependencies"
+poetry run demisto-sdk pre-commit >/dev/null 2>&1 || true
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,4 +1,4 @@
-// Development container for Content. Demisto-SDK 1.14.5
+// Development container for Content.
 {
 	"name": "XSOAR Content",
 	"build": {
@@ -74,13 +74,6 @@
 				"charliermarsh.ruff",
 				"ryanluker.vscode-coverage-gutters"
 			]
-		},
-		"codespaces": {
-			"repositories": {
-				"demisto/demisto-sdk": {
-					"permissions": "write-all"
-				}
-			}
 		}
 	},
 // this is commented out until VSCode will fix self signed certificate issues
@@ -104,8 +97,8 @@
 // "overrideFeatureInstallOrder": [
 // 	"ghcr.io/devcontainers/features/common-utils:1"
 // ],
-"onCreateCommand": "dos2unix -n .devcontainer/createCommand.sh .devcontainer/createCommand_unix.sh && chmod +x .devcontainer/createCommand_unix.sh && bash .devcontainer/createCommand_unix.sh",
-"postStartCommand": "poetry install",
+"onCreateCommand": "sudo dos2unix -n .devcontainer/createCommand.sh .devcontainer/createCommand_unix.sh && bash .devcontainer/createCommand_unix.sh",
+"postStartCommand": "poetry install && poetry run demisto-sdk pre-commit >/dev/null 2>&1 || true",
 "hostRequirements": {
 	"cpus": 4,
 	"memory": "8gb",
