From bec9c6f1dfab08dc0c38097e3253423f6f51fd39 Mon Sep 17 00:00:00 2001 From: brian moore Date: Sun, 29 Sep 2024 03:47:46 +0000 Subject: [PATCH] bm/polish-dev-container-setup --- .devcontainer/Dockerfile.devcontainer | 1 + .devcontainer/devcontainer.json | 10 ++++++---- scripts/makefiles/minikube.mk | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .devcontainer/Dockerfile.devcontainer diff --git a/.devcontainer/Dockerfile.devcontainer b/.devcontainer/Dockerfile.devcontainer new file mode 100644 index 0000000..56c29dd --- /dev/null +++ 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 index af377dc..866185a 100644 --- 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 index 6d36e25..1228652 100644 --- 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: