Refactor to mount

Author: shikanime

containers/kubernetes-helm/.devcontainer/Dockerfile

@@ -36,23 +36,25 @@ RUN curl -s https://raw.githubusercontent.com/helm/helm/master/scripts/get | bas
 # Copy localhost's ~/.kube/config file into the container and swap out localhost
 # for host.docker.internal whenever a new shell starts to keep them in sync.
 RUN echo '\n\
-if [ "$SYNC_LOCALHOST_KUBECONFIG" == "true" ]; then\n\
-    mkdir -p $HOME/.kube\n\
-    cp -r $HOME/.kube-localhost/* $HOME/.kube\n\
-    sed -i -e "s/localhost/host.docker.internal/g" $HOME/.kube/config;\n\
-fi' \
+mkdir -p $HOME/.kube\n\
+cp -r $HOME/.kube-localhost/* $HOME/.kube\n\
+sed -i -e "s/localhost/host.docker.internal/g" $HOME/.kube/config' \
 >> $HOME/.bashrc
 
 # Copy localhost's minikube certificate file into the container and swap out localhost
 RUN echo '\n\
-if [ "$SYNC_LOCALHOST_MINIKUBE" == "true" ]; then\n\
-    mkdir -p $HOME/.minikube\n\
+mkdir -p $HOME/.minikube\n\
+if [[ -f "$HOME/.minikube-localhost/ca.crt" ]]; then\n\
     cp -r $HOME/.minikube-localhost/ca.crt $HOME/.minikube\n\
+    sed -i -r "s|(\s*certificate-authority:\s).*|\\1$HOME\/.minikube\/ca.crt|g" $HOME/.kube/config\n\
+fi\n\
+if [[ -f "$HOME/.minikube-localhost/client.crt" ]]; then\n\
     cp -r $HOME/.minikube-localhost/client.crt $HOME/.minikube\n\
-    cp -r $HOME/.minikube-localhost/client.key $HOME/.minikube\n\
-    sed -i -r "s|(\s*client-key:\s).*|\\1$HOME\/.minikube\/client.key|g" $HOME/.kube/config;\n\
     sed -i -r "s|(\s*client-certificate:\s).*|\\1$HOME\/.minikube\/client.crt|g" $HOME/.kube/config\n\
-    sed -i -r "s|(\s*certificate-authority:\s).*|\\1$HOME\/.minikube\/ca.crt|g" $HOME/.kube/config;\n\
+fi\n\
+if [[ -f "$HOME/.minikube-localhost/client.key" ]]; then\n\
+    cp -r $HOME/.minikube-localhost/client.key $HOME/.minikube\n\
+    sed -i -r "s|(\s*client-key:\s).*|\\1$HOME\/.minikube\/client.key|g" $HOME/.kube/config\n\
 fi' \
 >> $HOME/.bashrc
 

containers/kubernetes-helm/.devcontainer/devcontainer.json

@@ -1,15 +1,13 @@
 {
-    "name": "Kubernetes & Helm",
-    "dockerFile": "Dockerfile",
-    "extensions": [
-        "peterjausovec.vscode-docker",
-        "ms-kubernetes-tools.vscode-kubernetes-tools"
-    ],
-    "runArgs": [
-      "-e", "SYNC_LOCALHOST_KUBECONFIG=true",
-      "-e", "SYNC_LOCALHOST_MINIKUBE=true",
-      "-v", "/var/run/docker.sock:/var/run/docker.sock",
-      "-v", "${env:HOME}${env:USERPROFILE}/.kube:/root/.kube-localhost",
-      "-v", "${env:HOME}${env:USERPROFILE}/.minikube:/root/.minikube-localhost"
-    ]
-}
+  "name": "Kubernetes & Helm",
+  "dockerFile": "Dockerfile",
+  "extensions": [
+    "peterjausovec.vscode-docker",
+    "ms-kubernetes-tools.vscode-kubernetes-tools"
+  ],
+  "runArgs": [
+    "--mount", "type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock",
+    "--mount", "type=bind,source=${env:HOME}${env:USERPROFILE}/.kube,target=/root/.kube-localhost",
+    "--mount", "type=bind,source=${env:HOME}${env:USERPROFILE}/.minikube,target=/root/.minikube-localhost"
+  ]
+}