From fec1e780d566262844c250ee1f6ff15714a72954 Mon Sep 17 00:00:00 2001 From: Paddy Morgan Date: Fri, 15 Jul 2022 21:14:39 +0100 Subject: [PATCH] Spelling correction: Minkube -> Minikube (#1534) --- .../library-scripts/kubectl-helm-debian.sh | 10 +- .../library-scripts/kubectl-helm-debian.sh | 10 +- .../library-scripts/kubectl-helm-debian.sh | 10 +- containers/kubernetes-helm/README.md | 8 +- devcontainer-collection.json | 98 ++++++++----------- .../src/devcontainer-features.json | 96 +++++++----------- script-library/kubectl-helm-debian.sh | 10 +- 7 files changed, 102 insertions(+), 140 deletions(-) diff --git a/containers/codespaces-linux/.devcontainer/library-scripts/kubectl-helm-debian.sh b/containers/codespaces-linux/.devcontainer/library-scripts/kubectl-helm-debian.sh index 0981024f..f3984cf2 100755 --- a/containers/codespaces-linux/.devcontainer/library-scripts/kubectl-helm-debian.sh +++ b/containers/codespaces-linux/.devcontainer/library-scripts/kubectl-helm-debian.sh @@ -75,7 +75,7 @@ find_version_from_git_tags() { local repository=$2 local prefix=${3:-"tags/v"} local separator=${4:-"."} - local last_part_optional=${5:-"false"} + local last_part_optional=${5:-"false"} if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then local escaped_separator=${separator//./\\.} local last_part @@ -225,8 +225,8 @@ if [ "${MINIKUBE_VERSION}" != "none" ]; then MINIKUBE_VERSION="v${MINIKUBE_VERSION}" fi fi - # latest is also valid in the download URLs - curl -sSL -o /usr/local/bin/minikube "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}" + # latest is also valid in the download URLs + curl -sSL -o /usr/local/bin/minikube "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}" chmod 0755 /usr/local/bin/minikube if [ "$MINIKUBE_SHA256" = "automatic" ]; then MINIKUBE_SHA256="$(curl -sSL "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}.sha256")" @@ -236,7 +236,7 @@ if [ "${MINIKUBE_VERSION}" != "none" ]; then echo '(!) minikube installation failed!' exit 1 fi - # Create minkube folder with correct privs in case a volume is mounted here + # Create minikube folder with correct privs in case a volume is mounted here mkdir -p "${USERHOME}/.minikube" chown -R $USERNAME "${USERHOME}/.minikube" chmod -R u+wrx "${USERHOME}/.minikube" @@ -246,4 +246,4 @@ if ! type docker > /dev/null 2>&1; then echo -e '\n(*) Warning: The docker command was not found.\n\nYou can use one of the following scripts to install it:\n\nhttps://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker-in-docker.md\n\nor\n\nhttps://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker.md' fi -echo -e "\nDone!" \ No newline at end of file +echo -e "\nDone!" diff --git a/containers/kubernetes-helm-minikube/.devcontainer/library-scripts/kubectl-helm-debian.sh b/containers/kubernetes-helm-minikube/.devcontainer/library-scripts/kubectl-helm-debian.sh index 0981024f..f3984cf2 100755 --- a/containers/kubernetes-helm-minikube/.devcontainer/library-scripts/kubectl-helm-debian.sh +++ b/containers/kubernetes-helm-minikube/.devcontainer/library-scripts/kubectl-helm-debian.sh @@ -75,7 +75,7 @@ find_version_from_git_tags() { local repository=$2 local prefix=${3:-"tags/v"} local separator=${4:-"."} - local last_part_optional=${5:-"false"} + local last_part_optional=${5:-"false"} if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then local escaped_separator=${separator//./\\.} local last_part @@ -225,8 +225,8 @@ if [ "${MINIKUBE_VERSION}" != "none" ]; then MINIKUBE_VERSION="v${MINIKUBE_VERSION}" fi fi - # latest is also valid in the download URLs - curl -sSL -o /usr/local/bin/minikube "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}" + # latest is also valid in the download URLs + curl -sSL -o /usr/local/bin/minikube "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}" chmod 0755 /usr/local/bin/minikube if [ "$MINIKUBE_SHA256" = "automatic" ]; then MINIKUBE_SHA256="$(curl -sSL "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}.sha256")" @@ -236,7 +236,7 @@ if [ "${MINIKUBE_VERSION}" != "none" ]; then echo '(!) minikube installation failed!' exit 1 fi - # Create minkube folder with correct privs in case a volume is mounted here + # Create minikube folder with correct privs in case a volume is mounted here mkdir -p "${USERHOME}/.minikube" chown -R $USERNAME "${USERHOME}/.minikube" chmod -R u+wrx "${USERHOME}/.minikube" @@ -246,4 +246,4 @@ if ! type docker > /dev/null 2>&1; then echo -e '\n(*) Warning: The docker command was not found.\n\nYou can use one of the following scripts to install it:\n\nhttps://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker-in-docker.md\n\nor\n\nhttps://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker.md' fi -echo -e "\nDone!" \ No newline at end of file +echo -e "\nDone!" diff --git a/containers/kubernetes-helm/.devcontainer/library-scripts/kubectl-helm-debian.sh b/containers/kubernetes-helm/.devcontainer/library-scripts/kubectl-helm-debian.sh index 0981024f..f3984cf2 100755 --- a/containers/kubernetes-helm/.devcontainer/library-scripts/kubectl-helm-debian.sh +++ b/containers/kubernetes-helm/.devcontainer/library-scripts/kubectl-helm-debian.sh @@ -75,7 +75,7 @@ find_version_from_git_tags() { local repository=$2 local prefix=${3:-"tags/v"} local separator=${4:-"."} - local last_part_optional=${5:-"false"} + local last_part_optional=${5:-"false"} if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then local escaped_separator=${separator//./\\.} local last_part @@ -225,8 +225,8 @@ if [ "${MINIKUBE_VERSION}" != "none" ]; then MINIKUBE_VERSION="v${MINIKUBE_VERSION}" fi fi - # latest is also valid in the download URLs - curl -sSL -o /usr/local/bin/minikube "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}" + # latest is also valid in the download URLs + curl -sSL -o /usr/local/bin/minikube "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}" chmod 0755 /usr/local/bin/minikube if [ "$MINIKUBE_SHA256" = "automatic" ]; then MINIKUBE_SHA256="$(curl -sSL "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}.sha256")" @@ -236,7 +236,7 @@ if [ "${MINIKUBE_VERSION}" != "none" ]; then echo '(!) minikube installation failed!' exit 1 fi - # Create minkube folder with correct privs in case a volume is mounted here + # Create minikube folder with correct privs in case a volume is mounted here mkdir -p "${USERHOME}/.minikube" chown -R $USERNAME "${USERHOME}/.minikube" chmod -R u+wrx "${USERHOME}/.minikube" @@ -246,4 +246,4 @@ if ! type docker > /dev/null 2>&1; then echo -e '\n(*) Warning: The docker command was not found.\n\nYou can use one of the following scripts to install it:\n\nhttps://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker-in-docker.md\n\nor\n\nhttps://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker.md' fi -echo -e "\nDone!" \ No newline at end of file +echo -e "\nDone!" diff --git a/containers/kubernetes-helm/README.md b/containers/kubernetes-helm/README.md index 0a97aee0..28a83a26 100644 --- a/containers/kubernetes-helm/README.md +++ b/containers/kubernetes-helm/README.md @@ -4,7 +4,7 @@ *Access a local (or remote) Kubernetes cluster from inside a dev container using your local config. Includes kubectl, Helm, and the Docker CLI.* -| Metadata | Value | +| Metadata | Value | |----------|-------| | *Contributors* | The VS Code team and Phetsinorath William | | *Categories* | Other | @@ -80,9 +80,9 @@ However, this section will outline the how you can selectively add this function That's it! -## A note on Minkube or otherwise using a local cluster +## A note on Minikube or otherwise using a local cluster -While this definition works with Minkube in most cases, if you hit trouble, make sure that your `~/.kube/config` file and Minikube certs reference your host's IP rather than `127.0.0.1` or `localhost` (since `localhost` resolve to the container itself rather than your local machine where Minikube is running). +While this definition works with Minikube in most cases, if you hit trouble, make sure that your `~/.kube/config` file and Minikube certs reference your host's IP rather than `127.0.0.1` or `localhost` (since `localhost` resolve to the container itself rather than your local machine where Minikube is running). This should happen by default on Linux. On macOS and Windows, we recommend using the Kuberntes install that comes with Docker Desktop instead of Minikube to avoid these kinds of issues. @@ -167,4 +167,4 @@ While you cannot sync or connect to your local Kubernetes configuration with Cod Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the MIT License. See [LICENSE](https://github.com/microsoft/vscode-dev-containers/blob/main/LICENSE). +Licensed under the MIT License. See [LICENSE](https://github.com/microsoft/vscode-dev-containers/blob/main/LICENSE). diff --git a/devcontainer-collection.json b/devcontainer-collection.json index 61b4c54e..10e51222 100644 --- a/devcontainer-collection.json +++ b/devcontainer-collection.json @@ -5,7 +5,7 @@ "ref": "", "sha": "", "tag": "" - }, + }, "definitions": [ { "id": "alpine", @@ -1055,7 +1055,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "20.10" ], + "proposals": ["latest", "20.10"], "default": "latest", "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)" }, @@ -1071,15 +1071,13 @@ "containerEnv": { "DOCKER_BUILDKIT": "1" }, - "extensions": [ - "ms-azuretools.vscode-docker" - ], + "extensions": ["ms-azuretools.vscode-docker"], // Problem #2 - The volume name here should be something unique per dev container. Need ability to either get a var that points to one or ask for a volume name "mounts": [ { - "source":"dind-var-lib-docker", - "target":"/var/lib/docker", - "type":"volume" + "source": "dind-var-lib-docker", + "target": "/var/lib/docker", + "type": "volume" } ], "include": [ @@ -1125,14 +1123,12 @@ "containerEnv": { "DOCKER_BUILDKIT": "1" }, - "extensions": [ - "ms-azuretools.vscode-docker" - ], + "extensions": ["ms-azuretools.vscode-docker"], "mounts": [ { - "source":"/var/run/docker.sock", - "target":"/var/run/docker-host.sock", - "type":"bind" + "source": "/var/run/docker.sock", + "target": "/var/run/docker-host.sock", + "type": "bind" } ], "include": [ @@ -1161,7 +1157,7 @@ }, { "id": "kubectl-helm-minikube", - "name": "Kubectl, Helm, and Minkube", + "name": "Kubectl, Helm, and Minikube", "documentationURL": "https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/kubectl-helm.md", "options": { "version": { @@ -1184,15 +1180,13 @@ } }, "buildArg": "_VSC_INSTALL_KUBECTL_HELM_MINIKUBE", - "extensions": [ - "ms-kubernetes-tools.vscode-kubernetes-tools" - ], + "extensions": ["ms-kubernetes-tools.vscode-kubernetes-tools"], // Problem #2 - The volume name here should be something unique per dev container. Need ability to either get a var that points to one or ask for a volume name "mounts": [ { - "source":"minikube-config", - "target":"/home/vscode/.minikube", - "type":"volume" + "source": "minikube-config", + "target": "/home/vscode/.minikube", + "type": "volume" } ], "include": [ @@ -1248,7 +1242,7 @@ "HashiCorp.terraform", "ms-azuretools.vscode-azureterraform" ], - "settings": { + "settings": { "terraform.languageServer": { "enabled": true, "args": [] @@ -1423,9 +1417,7 @@ } }, "buildArg": "_VSC_INSTALL_AZURE_CLI", - "extensions": [ - "ms-vscode.azurecli" - ], + "extensions": ["ms-vscode.azurecli"], "include": [ "cpp", "dotnet", @@ -1511,7 +1503,7 @@ }, "password": { "type": "string", - "proposals": ["vscode","codespaces","password"], + "proposals": ["vscode", "codespaces", "password"], "default": "vscode", "description": "Enter a password for desktop connections" }, @@ -1616,7 +1608,7 @@ "options": { "version": { "type": "string", - "proposals": [ "lts", "latest", "16", "14", "12" ], + "proposals": ["lts", "latest", "16", "14", "12"], "default": "lts", "description": "Select or enter a Node.js version to install" }, @@ -1629,10 +1621,11 @@ "buildArg": "_VSC_INSTALL_NODE", "extensions": ["dbaeumer.vscode-eslint"], "containerEnv": { - "NVM_DIR":"/usr/local/share/nvm", + "NVM_DIR": "/usr/local/share/nvm", "NVM_SYMLINK_CURRENT": "true", "PATH": "${NVM_DIR}/current/bin:${PATH}" - }, "include": [ + }, + "include": [ "cpp", "kubernetes-helm", "kubernetes-helm-minikube", @@ -1651,7 +1644,7 @@ "options": { "version": { "type": "string", - "enum": [ "latest", "os-provided", "3.10", "3.9", "3.8", "3.7", "3.6" ], + "enum": ["latest", "os-provided", "3.10", "3.9", "3.8", "3.7", "3.6"], "default": "os-provided", "description": "Select a Python version to install." }, @@ -1667,17 +1660,14 @@ } }, "buildArg": "_VSC_INSTALL_PYTHON", - "extensions": [ - "ms-python.python", - "ms-python.vscode-pylance" - ], + "extensions": ["ms-python.python", "ms-python.vscode-pylance"], "containerEnv": { "PYTHON_PATH": "/usr/local/python", "PIPX_HOME": "/usr/local/py-utils", "PIPX_BIN_DIR": "/usr/local/py-utils/bin", - "PATH":"${PYTHON_PATH}/bin:${PATH}:${PIPX_BIN_DIR}" + "PATH": "${PYTHON_PATH}/bin:${PATH}:${PIPX_BIN_DIR}" }, - "settings": { + "settings": { "python.defaultInterpreterPath": "/usr/local/bin/python", "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8", "python.formatting.blackPath": "/usr/local/py-utils/bin/black", @@ -1735,8 +1725,8 @@ "GOROOT": "/usr/local/go", "PATH": "${GOPATH}/bin:${GOROOT}/bin:${PATH}" }, - "capAdd": [ "SYS_PTRACE" ], - "securityOpt": [ "seccomp=unconfined" ], + "capAdd": ["SYS_PTRACE"], + "securityOpt": ["seccomp=unconfined"], "include": [ "cpp", "kubernetes-helm", @@ -1878,7 +1868,8 @@ "containerEnv": { "SDKMAN_DIR": "/usr/local/sdkman", "PATH": "${SDKMAN_DIR}/bin:${SDKMAN_DIR}/candidates/gradle/current/bin:${PATH}" - }, "include": [ + }, + "include": [ "cpp", "kubernetes-helm", "kubernetes-helm-minikube", @@ -1919,9 +1910,7 @@ } }, "buildArg": "_VSC_INSTALL_RUBY", - "extensions": [ - "rebornix.Ruby" - ], + "extensions": ["rebornix.Ruby"], "containerEnv": { "GEM_PATH": "/usr/local/rvm/gems/default:/usr/local/rvm/gems/default@global", "GEM_HOME": "/usr/local/rvm/gems/default", @@ -1980,14 +1969,14 @@ "mutantdino.resourcemonitor", "rust-lang.rust-analyzer", "tamasfe.even-better-toml", - "serayuzgur.crates" + "serayuzgur.crates" ], "containerEnv": { "CARGO_HOME": "/usr/local/cargo", "RUSTUP_HOME": "/usr/local/rustup", "PATH": "${CARGO_HOME}/bin:${PATH}" }, - "capAdd": [ "SYS_PTRACE" ], + "capAdd": ["SYS_PTRACE"], "securityOpt": ["seccomp=unconfined"], "settings": { "lldb.executable": "/usr/bin/lldb", @@ -2083,18 +2072,18 @@ "description": "Install Oh My Zsh!?" }, "upgradePackages": { - "type":"boolean", + "type": "boolean", "default": true, "description": "Upgrade OS packages?" }, "username": { - "type":"string", + "type": "string", "proposals": ["vscode", "codespace", "none", "automatic"], "default": "automatic", "description": "Enter name of non-root user to configure or none to skip" }, "uid": { - "type":"string", + "type": "string", "proposals": ["1000", "automatic"], "default": "automatic", "description": "Enter uid for non-root user" @@ -2106,16 +2095,13 @@ "description": "Enter gid for non-root user" }, "nonFreePackages": { - "type":"boolean", + "type": "boolean", "default": true, "description": "Add packages from non-free Debian repository?" } }, "buildArg": "_VSC_INSTALL_COMMON", - "include": [ - "puppet", - "chef" - ] + "include": ["puppet", "chef"] }, { "id": "dotnet", @@ -2124,12 +2110,12 @@ "options": { "version": { "type": "string", - "proposals": ["latest","6.0","5.0","3.1"], + "proposals": ["latest", "6.0", "5.0", "3.1"], "default": "latest", "description": "Select or enter a dotnet CLI version. (Available versions may vary by Linux distribution.)" }, "runtimeOnly": { - "type":"boolean", + "type": "boolean", "default": false, "description": "Install just the dotnet runtime if true, and sdk if false." } @@ -2139,9 +2125,7 @@ "DOTNET_ROOT": "/usr/local/dotnet", "PATH": "${PATH}:${DOTNET_ROOT}" }, - "extensions": [ - "ms-dotnettools.csharp" - ], + "extensions": ["ms-dotnettools.csharp"], "include": [ "cpp", "kubernetes-helm", diff --git a/script-library/container-features/src/devcontainer-features.json b/script-library/container-features/src/devcontainer-features.json index e2b895d2..4846ff27 100644 --- a/script-library/container-features/src/devcontainer-features.json +++ b/script-library/container-features/src/devcontainer-features.json @@ -8,7 +8,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "20.10" ], + "proposals": ["latest", "20.10"], "default": "latest", "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)" }, @@ -19,7 +19,7 @@ }, "dockerDashComposeVersion": { "type": "string", - "enum": ["v1", "v2" ], + "enum": ["v1", "v2"], "default": "v1", "description": "Default version of Docker Compose (v1 or v2)" } @@ -30,15 +30,13 @@ "containerEnv": { "DOCKER_BUILDKIT": "1" }, - "extensions": [ - "ms-azuretools.vscode-docker" - ], + "extensions": ["ms-azuretools.vscode-docker"], // Problem #2 - The volume name here should be something unique per dev container. Need ability to either get a var that points to one or ask for a volume name "mounts": [ { - "source":"dind-var-lib-docker", - "target":"/var/lib/docker", - "type":"volume" + "source": "dind-var-lib-docker", + "target": "/var/lib/docker", + "type": "volume" } ], "include": [ @@ -85,7 +83,7 @@ }, "dockerDashComposeVersion": { "type": "string", - "enum": ["v1", "v2" ], + "enum": ["v1", "v2"], "default": "v1", "description": "Compose version to use for docker-compose (v1 or v2)" } @@ -95,14 +93,12 @@ "containerEnv": { "DOCKER_BUILDKIT": "1" }, - "extensions": [ - "ms-azuretools.vscode-docker" - ], + "extensions": ["ms-azuretools.vscode-docker"], "mounts": [ { - "source":"/var/run/docker.sock", - "target":"/var/run/docker-host.sock", - "type":"bind" + "source": "/var/run/docker.sock", + "target": "/var/run/docker-host.sock", + "type": "bind" } ], "include": [ @@ -131,7 +127,7 @@ }, { "id": "kubectl-helm-minikube", - "name": "Kubectl, Helm, and Minkube", + "name": "Kubectl, Helm, and Minikube", "documentationURL": "https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/kubectl-helm.md", "options": { "version": { @@ -154,15 +150,13 @@ } }, "buildArg": "_VSC_INSTALL_KUBECTL_HELM_MINIKUBE", - "extensions": [ - "ms-kubernetes-tools.vscode-kubernetes-tools" - ], + "extensions": ["ms-kubernetes-tools.vscode-kubernetes-tools"], // Problem #2 - The volume name here should be something unique per dev container. Need ability to either get a var that points to one or ask for a volume name "mounts": [ { - "source":"minikube-config", - "target":"/home/vscode/.minikube", - "type":"volume" + "source": "minikube-config", + "target": "/home/vscode/.minikube", + "type": "volume" } ], "include": [ @@ -387,17 +381,13 @@ "options": { "version": { "type": "string", - "proposals": [ - "latest" - ], + "proposals": ["latest"], "default": "latest", "description": "Select or enter an AWS CLI version. (Available versions here: https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst)" } }, "buildArg": "_VSC_INSTALL_AWS_CLI", - "extensions": [ - "AmazonWebServices.aws-toolkit-vscode" - ], + "extensions": ["AmazonWebServices.aws-toolkit-vscode"], "include": [ "cpp", "dotnet", @@ -440,9 +430,7 @@ } }, "buildArg": "_VSC_INSTALL_AZURE_CLI", - "extensions": [ - "ms-vscode.azurecli" - ], + "extensions": ["ms-vscode.azurecli"], "include": [ "cpp", "dotnet", @@ -528,7 +516,7 @@ }, "password": { "type": "string", - "proposals": ["vscode","codespaces","password"], + "proposals": ["vscode", "codespaces", "password"], "default": "vscode", "description": "Enter a password for desktop connections" }, @@ -680,7 +668,7 @@ "options": { "version": { "type": "string", - "proposals": [ "lts", "latest", "18", "16", "14" ], + "proposals": ["lts", "latest", "18", "16", "14"], "default": "lts", "description": "Select or enter a Node.js version to install" }, @@ -693,7 +681,7 @@ "buildArg": "_VSC_INSTALL_NODE", "extensions": ["dbaeumer.vscode-eslint"], "containerEnv": { - "NVM_DIR":"/usr/local/share/nvm", + "NVM_DIR": "/usr/local/share/nvm", "NVM_SYMLINK_CURRENT": "true", "PATH": "${NVM_DIR}/current/bin:${PATH}" }, @@ -716,7 +704,7 @@ "options": { "version": { "type": "string", - "enum": [ "latest", "os-provided", "3.10", "3.9", "3.8", "3.7", "3.6" ], + "enum": ["latest", "os-provided", "3.10", "3.9", "3.8", "3.7", "3.6"], "default": "os-provided", "description": "Select a Python version to install." }, @@ -732,15 +720,12 @@ } }, "buildArg": "_VSC_INSTALL_PYTHON", - "extensions": [ - "ms-python.python", - "ms-python.vscode-pylance" - ], + "extensions": ["ms-python.python", "ms-python.vscode-pylance"], "containerEnv": { "PYTHON_PATH": "/usr/local/python", "PIPX_HOME": "/usr/local/py-utils", "PIPX_BIN_DIR": "/usr/local/py-utils/bin", - "PATH":"${PYTHON_PATH}/bin:${PATH}:${PIPX_BIN_DIR}" + "PATH": "${PYTHON_PATH}/bin:${PATH}:${PIPX_BIN_DIR}" }, "settings": { "python.defaultInterpreterPath": "/usr/local/bin/python", @@ -799,8 +784,8 @@ "GOPATH": "/go", "PATH": "${GOPATH}/bin:${GOROOT}/bin:${PATH}" }, - "capAdd": [ "SYS_PTRACE" ], - "securityOpt": [ "seccomp=unconfined" ], + "capAdd": ["SYS_PTRACE"], + "securityOpt": ["seccomp=unconfined"], "include": [ "cpp", "kubernetes-helm", @@ -984,9 +969,7 @@ } }, "buildArg": "_VSC_INSTALL_RUBY", - "extensions": [ - "rebornix.Ruby" - ], + "extensions": ["rebornix.Ruby"], "containerEnv": { "GEM_PATH": "/usr/local/rvm/gems/default:/usr/local/rvm/gems/default@global", "GEM_HOME": "/usr/local/rvm/gems/default", @@ -1052,7 +1035,7 @@ "RUSTUP_HOME": "/usr/local/rustup", "PATH": "${CARGO_HOME}/bin:${PATH}" }, - "capAdd": [ "SYS_PTRACE" ], + "capAdd": ["SYS_PTRACE"], "securityOpt": ["seccomp=unconfined"], "settings": { "lldb.executable": "/usr/bin/lldb", @@ -1148,18 +1131,18 @@ "description": "Install Oh My Zsh!?" }, "upgradePackages": { - "type":"boolean", + "type": "boolean", "default": true, "description": "Upgrade OS packages?" }, "username": { - "type":"string", + "type": "string", "proposals": ["vscode", "codespace", "none", "automatic"], "default": "automatic", "description": "Enter name of non-root user to configure or none to skip" }, "uid": { - "type":"string", + "type": "string", "proposals": ["1000", "automatic"], "default": "automatic", "description": "Enter uid for non-root user" @@ -1171,16 +1154,13 @@ "description": "Enter gid for non-root user" }, "nonFreePackages": { - "type":"boolean", + "type": "boolean", "default": true, "description": "Add packages from non-free Debian repository?" } }, "buildArg": "_VSC_INSTALL_COMMON", - "include": [ - "puppet", - "chef" - ] + "include": ["puppet", "chef"] }, { "id": "dotnet", @@ -1189,12 +1169,12 @@ "options": { "version": { "type": "string", - "proposals": ["latest","6.0","5.0","3.1"], + "proposals": ["latest", "6.0", "5.0", "3.1"], "default": "latest", "description": "Select or enter a dotnet CLI version. (Available versions may vary by Linux distribution.)" }, "runtimeOnly": { - "type":"boolean", + "type": "boolean", "default": false, "description": "Install just the dotnet runtime if true, and sdk if false." } @@ -1204,9 +1184,7 @@ "DOTNET_ROOT": "/usr/local/dotnet", "PATH": "${PATH}:${DOTNET_ROOT}" }, - "extensions": [ - "ms-dotnettools.csharp" - ], + "extensions": ["ms-dotnettools.csharp"], "include": [ "cpp", "kubernetes-helm", diff --git a/script-library/kubectl-helm-debian.sh b/script-library/kubectl-helm-debian.sh index 0981024f..f3984cf2 100755 --- a/script-library/kubectl-helm-debian.sh +++ b/script-library/kubectl-helm-debian.sh @@ -75,7 +75,7 @@ find_version_from_git_tags() { local repository=$2 local prefix=${3:-"tags/v"} local separator=${4:-"."} - local last_part_optional=${5:-"false"} + local last_part_optional=${5:-"false"} if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then local escaped_separator=${separator//./\\.} local last_part @@ -225,8 +225,8 @@ if [ "${MINIKUBE_VERSION}" != "none" ]; then MINIKUBE_VERSION="v${MINIKUBE_VERSION}" fi fi - # latest is also valid in the download URLs - curl -sSL -o /usr/local/bin/minikube "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}" + # latest is also valid in the download URLs + curl -sSL -o /usr/local/bin/minikube "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}" chmod 0755 /usr/local/bin/minikube if [ "$MINIKUBE_SHA256" = "automatic" ]; then MINIKUBE_SHA256="$(curl -sSL "https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-${architecture}.sha256")" @@ -236,7 +236,7 @@ if [ "${MINIKUBE_VERSION}" != "none" ]; then echo '(!) minikube installation failed!' exit 1 fi - # Create minkube folder with correct privs in case a volume is mounted here + # Create minikube folder with correct privs in case a volume is mounted here mkdir -p "${USERHOME}/.minikube" chown -R $USERNAME "${USERHOME}/.minikube" chmod -R u+wrx "${USERHOME}/.minikube" @@ -246,4 +246,4 @@ if ! type docker > /dev/null 2>&1; then echo -e '\n(*) Warning: The docker command was not found.\n\nYou can use one of the following scripts to install it:\n\nhttps://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker-in-docker.md\n\nor\n\nhttps://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker.md' fi -echo -e "\nDone!" \ No newline at end of file +echo -e "\nDone!"