Merge pull request #64 from stuartleeks/sl/ignore-non-dev-container

Ignore non dev containers

Author: stuartleeks

.devcontainer/Dockerfile

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM golang:1.14-stretch
+FROM golang:1.15-stretch
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -37,6 +37,8 @@ RUN groupadd --gid $USER_GID $USERNAME \
 
 # Set default user
 USER $USERNAME
+RUN mkdir -p ~/.local/bin
+ENV PATH /home/${USERNAME}/.local/bin:$PATH
 
 # Set env for tracking that we're running in a devcontainer
 ENV DEVCONTAINER=true
@@ -74,3 +76,9 @@ RUN /tmp/gh.sh
 
 # symlink gh config folder
 RUN echo 'if [[ ! -d /home/vscode/.config/gh ]]; then mkdir -p /home/vscode/.config; ln -s /config/gh /home/vscode/.config/gh; fi ' >> ~/.bashrc
+
+ARG DOCKER_GROUP_ID
+
+# docker-from-docker
+COPY scripts/docker-client.sh /tmp/
+RUN /tmp/docker-client.sh

.devcontainer/devcontainer.json

@@ -4,7 +4,13 @@
 	"name": "devcontainer-cli",
 	"dockerFile": "Dockerfile",
 	"build": {
-		"cacheFrom": "ghcr.io/stuartleeks/devcontainer-cli-devcontainer"
+		"cacheFrom": "ghcr.io/stuartleeks/devcontainer-cli-devcontainer",
+		"args": {
+			// To ensure that the group ID for the docker group in the container
+			// matches the group ID on the host, add this to your .bash_profile on the host
+			// 		export DOCKER_GROUP_ID=$(getent group docker | awk -F ":" '{ print $3 }')
+			"DOCKER_GROUP_ID": "${localEnv:DOCKER_GROUP_ID}"
+		}
 	},
 	"runArgs": [
 		// Uncomment the next line to use a non-root user. On Linux, this will prevent
@@ -49,7 +55,8 @@
 		"darkriszty.markdown-table-prettify",
         "davidanson.vscode-markdownlint",
         "mushan.vscode-paste-image"
-	],
+	,
+		"ms-azuretools.vscode-docker",],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
@@ -69,6 +76,6 @@
 		// Mounts the .azure host folder into the dev container to pick up host az CLI login details
 		"type=bind,source=${env:HOME}${env:USERPROFILE}/.azure,target=/home/vscode/.azure",
 		// Mount host docker socket
-		"type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock",
+		"type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock",	
 	],
 }

.devcontainer/scripts/docker-client.sh

@@ -0,0 +1,30 @@
+#!/bin/bash 
+set -e
+
+VERSION=${1:-"20.10.5"}
+INSTALL_DIR=${2:-"$HOME/.local/bin"}
+CMD=docker
+NAME="Docker Client"
+
+echo -e "\e[34m»»» 📦 \e[32mInstalling \e[33m$NAME \e[35mv$VERSION\e[0m ..."
+
+mkdir -p $INSTALL_DIR
+curl -sSL https://download.docker.com/linux/static/stable/x86_64/docker-$VERSION.tgz -o /tmp/docker.tgz
+tar -zxvf /tmp/docker.tgz -C /tmp docker/docker
+chmod +x /tmp/docker/docker
+mv /tmp/docker/docker $INSTALL_DIR/docker
+rmdir /tmp/docker/
+rm -rf /tmp/docker.tgz
+
+echo -e "\n\e[34m»»» 💾 \e[32mInstalled to: \e[33m$(which $CMD)"
+echo -e "\e[34m»»» 💡 \e[32mVersion details: \e[39m$($CMD --version)"
+
+
+if [ -z "$DOCKER_GROUP_ID" ]; then
+    sudo groupadd docker
+else
+    sudo groupadd -g $DOCKER_GROUP_ID docker
+fi
+
+sudo usermod -aG docker $(whoami) && newgrp docker
+getent group docker

.vscode/launch.json

@@ -11,7 +11,7 @@
             "mode": "auto",
             "program": "${workspaceFolder}/cmd/devcontainer",
             "env": {},
-            "args": ["template", "list"],
+            "args": ["list"],
             "dlvLoadConfig": {
                 "followPointers": true,
                 "maxVariableRecurse": 1,

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/sys v0.0.0-20211013075003-97ac67df715c // indirect
+	golang.org/x/sys v0.0.0-20211015200801-69063c4bb744 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 

go.sum

@@ -183,6 +183,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8=
 golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211015200801-69063c4bb744 h1:KzbpndAYEM+4oHRp9JmB2ewj0NHHxO3Z0g7Gus2O1kk=
+golang.org/x/sys v0.0.0-20211015200801-69063c4bb744/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

internal/pkg/devcontainers/dockerutils.go

@@ -59,6 +59,17 @@ func ListDevcontainers() ([]DevcontainerInfo, error) {
 	for scanner.Scan() {
 		line := scanner.Text()
 		parts := strings.Split(line, "|")
+		localPath := parts[listPartLocalFolder]
+		if localPath == "" {
+			// not a dev container
+			continue
+		}
+		if wsl.HasWslPathPrefix(localPath) && wsl.IsWsl() {
+			localPath, err = wsl.ConvertWindowsPathToWslPath(localPath)
+			if err != nil {
+				return []DevcontainerInfo{}, fmt.Errorf("error converting path: %s", err)
+			}
+		}
 		name := parts[listPartLocalFolder]
 		if name == "" {
 			// No local folder => use dockercompose parts
@@ -69,13 +80,6 @@ func ListDevcontainers() ([]DevcontainerInfo, error) {
 				name = name[index+1:]
 			}
 		}
-		localPath := parts[listPartLocalFolder]
-		if wsl.HasWslPathPrefix(localPath) && wsl.IsWsl() {
-			localPath, err = wsl.ConvertWindowsPathToWslPath(localPath)
-			if err != nil {
-				return []DevcontainerInfo{}, fmt.Errorf("error converting path: %s", err)
-			}
-		}
 		devcontainer := DevcontainerInfo{
 			ContainerID:      parts[listPartID],
 			ContainerName:    parts[listPartContainerName],