Merge pull request #9 from datastx/bm/polish-dev-container-setup

bm/polish-dev-container-setup
datastx · Sep 29, 2024 · 9872443 · 9872443
2 parents 402d11d + bec9c6f
commit 9872443
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.devcontainer/Dockerfile.devcontainer b/.devcontainer/Dockerfile.devcontainer
@@ -0,0 +1 @@
+FROM --platform=arm64 mcr.microsoft.com/devcontainers/base:bullseye
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -2,8 +2,10 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/kubernetes-helm-minikube
 {
     "name": "Kubernetes - Minikube-in-Docker",
-    // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-    "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+    "build": {
+        "dockerfile": "Dockerfile.devcontainer", // Specify your custom Dockerfile here
+        "context": "."
+    },
     "customizations": {
         "vscode": {
             "extensions": [
@@ -23,8 +25,8 @@
         "ghcr.io/devcontainers/features/docker-in-docker:2": {
             "enableNonRootDocker": "true",
             "moby": "true",
-            "cpus": "4",
-            "memory": "6g"
+            "cpus": "6",
+            "memory": "10g"
         },
     },
     "postCreateCommand": "git config --global --add safe.directory /workspaces/DuckDB-k8s"

diff --git a/scripts/makefiles/minikube.mk b/scripts/makefiles/minikube.mk
@@ -4,8 +4,8 @@ mk-start: mk-install mk-config
 	minikube start
 
 mk-config:
-	minikube config set memory 6000
-	minikube config set cpus 4
+	minikube config set memory 10000
+	minikube config set cpus 6
 	minikube delete
 
 mk-stop:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		FROM --platform=arm64 mcr.microsoft.com/devcontainers/base:bullseye