Merge branch 'main' into fixup-advanced-monitoring-ci-pipeline

cmu-db · Feb 14, 2025 · ce2b83f · ce2b83f
2 parents ab8678b + c370656
commit ce2b83f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -25,8 +25,15 @@
         "--env-file=.env"
     ],
     "features": {
-        "ghcr.io/devcontainers/features/docker-outside-of-docker": {},
-        "ghcr.io/stuartleeks/dev-container-features/shell-history": {}
+        "ghcr.io/devcontainers/features/docker-outside-of-docker": {
+            "moby": true,
+            "installDockerBuildx": true,
+            "installDockerComposeSwitch": true,
+            "version": "latest",
+            "dockerDashComposeVersion": "v2"
+        },
+        "ghcr.io/stuartleeks/dev-container-features/shell-history": {},
+        "ghcr.io/devcontainers/features/git": {}
     },
     "containerEnv": {
         "http_proxy": "${localEnv:http_proxy}",

diff --git a/docker/benchbase/devcontainer/Dockerfile b/docker/benchbase/devcontainer/Dockerfile
@@ -17,6 +17,7 @@ ARG CONTAINERUSER_GID=1000
 RUN groupadd --non-unique --gid ${CONTAINERUSER_GID} containergroup \
     && useradd --non-unique --create-home --no-user-group --comment 'Container User' \
         --uid ${CONTAINERUSER_UID} --gid ${CONTAINERUSER_GID} containeruser \
+    && echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
     && echo 'containeruser ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 RUN mkdir -p /benchbase/results && chown -R containeruser:containergroup /benchbase/
 USER containeruser