Use a marker file to not run a feature script with the same arguments twice (#1100)

Author: Chuxel

script-library/container-features/src/feature-scripts.env

@@ -3,7 +3,7 @@ _VSC_INSTALL_DOCKER_FROM_DOCKER="docker-debian.sh true /var/run/docker-host.sock
 _VSC_INSTALL_KUBECTL_HELM_MINIKUBE="kubectl-helm-debian.sh ${_BUILD_ARG_KUBECTL_HELM_MINIKUBE_VERSION:-latest} ${_BUILD_ARG_KUBECTL_HELM_MINIKUBE_HELM:-latest} ${_BUILD_ARG_KUBECTL_HELM_MINIKUBE_MINIKUBE:-latest}"
 _VSC_INSTALL_TERRAFORM="terraform-debian.sh ${_BUILD_ARG_TERRAFORM_VERSION:-latest} ${_BUILD_ARG_TERRAFORM_TFLINT:-latest} ${_BUILD_ARG_TERRAFORM_TERRAGRUNT:-latest}"
 _VSC_INSTALL_GIT="git-from-src-debian.sh ${_BUILD_ARG_GIT_VERSION:-latest} ${_BUILD_ARG_GIT_PPA:-true}"
-_VSC_INSTALL_GIT_LFS=git-lfs-debian.sh
+_VSC_INSTALL_GIT_LFS="git-lfs-debian.sh ${_BUILD_ARG_GIT_LFS_VERSION:-latest}"
 _VSC_INSTALL_GITHUB_CLI="github-debian.sh ${_BUILD_ARG_GITHUB_CLI_VERSION:-latest}"
 _VSC_INSTALL_AZURE_CLI="azcli-debian.sh ${_BUILD_ARG_AZURE_CLI_VERSION:-latest}"
 _VSC_INSTALL_SSH=sshd-debian.sh

script-library/container-features/src/install.sh

@@ -26,16 +26,27 @@ set +a
 chmod +x *.sh
 
 # Execute option scripts if correct environment variable is set to "true"
+feature_marker_path="/usr/local/etc/vscode-dev-containers/features"
+mkdir -p "${feature_marker_path}"
 while IFS= read -r feature_line; do
     # Extract the env var part of the line
     feature_var_name="${feature_line%%=*}"
     if [ ! -z "${!feature_var_name}" ]; then
         # If a value is set for the env var, execute the script
         feature_script_and_args="${feature_line##*=}"
         feature_script_and_args="${feature_script_and_args%\"}"
-        # Execute the script line - but do not quote so arguments can be included in the 
-        echo "${feature_script_and_args#\"}"
-        eval "./${feature_script_and_args#\"}"
+        script_command="$(eval echo "${feature_script_and_args#\"}")"
+        echo "(*) Script: ${script_command}"
+
+        # Check if script with same args has already been run
+        feature_marker="${feature_marker_path}/${feature_var_name}";
+        if [ -e "${feature_marker}" ] && [ "${script_command}" = "$(cat ${feature_marker})" ]; then
+            echo "(*) Skipping. Script already run with same arguments."
+        else
+            # Execute script and create a marker with the script args
+            echo "${script_command}" > "${feature_marker}"
+            ./${script_command}
+        fi
     fi
 done < ./feature-scripts.env
 

script-library/container-features/test-features.env

@@ -1 +1,49 @@
-_VSC_JAVA_VERSION=8
+_VSC_INSTALL_NODE=true
+_BUILD_ARG_NODE_VERSION=14
+_BUILD_ARG_NODE_NODEGYPDEPENDENCIES=false
+_VSC_INSTALL_DOCKER_IN_DOCKER=true
+_BUILD_ARG_DOCKER_IN_DOCKER_VERSION=latest
+_BUILD_ARG_DOCKER_IN_DOCKER_MOBY=false
+_VSC_INSTALL_DOCKER_FROM_DOCKER=true
+_BUILD_ARG_DOCKER_FROM_DOCKER_VERSION=latest
+_BUILD_ARG_DOCKER_FROM_DOCKER_MOBY=false
+_VSC_INSTALL_KUBECTL_HELM_MINIKUBE=true
+_BUILD_ARG_KUBECTL_HELM_MINIKUBE_VERSION=latest
+_BUILD_ARG_KUBECTL_HELM_MINIKUBE_HELM=latest
+_BUILD_ARG_KUBECTL_HELM_MINIKUBE_MINIKUBE=latest
+_VSC_INSTALL_TERRAFORM=true
+_BUILD_ARG_TERRAFORM_VERSION=latest
+_BUILD_ARG_TERRAFORM_TFLINT=latest
+_BUILD_ARG_TERRAFORM_TERRAGRUNT=latest
+_VSC_INSTALL_GIT=true
+_BUILD_ARG_GIT_VERSION=os-provided
+_BUILD_ARG_GIT_PPA=false
+_VSC_INSTALL_GIT_LFS=true
+_BUILD_ARG_GIT_LFS_VERSION=latest
+_VSC_INSTALL_GITHUB_CLI=true
+_BUILD_ARG_GITHUB_CLI_VERSION=latest
+_VSC_INSTALL_AZURE_CLI=true
+_BUILD_ARG_AZURE_CLI_VERSION=latest
+_VSC_INSTALL_SSH=true
+#_VSC_INSTALL_HOMEBREW=true
+_VSC_INSTALL_NODE=true
+_BUILD_ARG_NODE_VERSION=lts
+_BUILD_ARG_NODE_NODEGYPDEPENDENCIES=false
+_VSC_INSTALL_PYTHON=true
+_BUILD_ARG_PYTHON_VERSION=os-provided
+_VSC_INSTALL_GOLANG=true
+_BUILD_ARG_GOLANG_VERSION=latest
+_VSC_INSTALL_JAVA=true
+_BUILD_ARG_JAVA_VERSION=latest
+_VSC_INSTALL_GRADLE=
+_BUILD_ARG_GRADLE_VERSION=latest
+_VSC_INSTALL_MAVEN=true
+_BUILD_ARG_MAVEN_VERSION=latest
+_VSC_INSTALL_RUBY=true
+_BUILD_ARG_RUBY_VERSION=latest
+_VSC_INSTALL_RUST=true
+_BUILD_ARG_RUST_VERSION=latest
+_BUILD_ARG_RUST_PROFILE=minimal
+_VSC_INSTALL_POWERSHELL=true
+_BUILD_ARG_POWERSHELL_VERSION=latest
+_VSC_INSTALL_DESKTOP_LITE=true

script-library/container-features/test.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-IMAGE_TO_TEST="${1:-"mcr.microsoft.com/vscode/devcontainers/base:buster"}"
+IMAGE_TO_TEST="${1:-"mcr.microsoft.com/vscode/devcontainers/base:bullseye"}"
 PLATFORMS="${2:-""}"
 SCRIPT_DIR="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"