remove unused dirs (#76)

145f26f8 · Josh Spicer · GitHub · 73db1be5 · 73db1be5 · 73db1be5
Unverified Commit 145f26f8 authored Aug 03, 2022 by Josh Spicer Committed by GitHub Aug 03, 2022
7 changed files
--- a/.github/workflows/release-v1.yaml
+++ b/.github/workflows/release-v1.yaml
-name: "(Release-v1) Package dev container features (v1)"
-on:
-  push:
-    tags:
-      - "v0.0.1"
-  workflow_dispatch:
-
-jobs:
-  deploy: # make sure the action works on a clean machine without building
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Combine Feature Fragments
-        run: ./v1/combine-feature-fragments.py > ./devcontainer-features.json
-
-      - name: Copy scripts to src folder
-        id: copy_scripts
-        run: cp -r ./v1/install.sh ./v1/feature-scripts.env ./devcontainer-features.json   ./src
-
-      - name: Debug Output
-        run: sudo apt install tree -y && tree
-
-      - name: Generate tgz
-        uses: microsoft/publish-dev-container-features-action@main
-        with:
-          publish-features: "true"
-          path-to-features: "./src"
-          publish-definitions: "false"
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: devcontainer-features.tgz
-          path: devcontainer-features.tgz
-
-      - name: Get or Create Release at current tag
-        uses: ncipollo/release-action@v1
-        with:
-          allowUpdates: true # Lets us upload our own artifact from previous step
-          artifactErrorsFailBuild: true
-          artifacts: "./devcontainer-*"
-          token: ${{ secrets.GITHUB_TOKEN }}
--- a/lib/settings.env
+++ b/lib/settings.env
-PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5"
-DEADSNAKES_PPA_ARCHIVE_GPG_KEY="F23C5A6CF475977595C89F51BA6932366A755776"
-RVM_GPG_KEYS="409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
-TERRAFORM_GPG_KEYS=72D7468F
-GIT_CORE_PPA_ARCHIVE_GPG_KEY=E1DD270288B4E6030699E45FA1715D88E1DF1F24
-GITHUB_CLI_ARCHIVE_GPG_KEY=C99B11DEB97541F0
-GIT_LFS_ARCHIVE_GPG_KEY_URI="https://packagecloud.io/github/git-lfs/gpgkey"
-GIT_LFS_ARCHIVE_ARCHITECTURES="amd64 arm64"
-GIT_LFS_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
-GIT_LFS_CHECKSUM_GPG_KEYS="0x88ace9b29196305ba9947552f1ba225c0223b187 0x86cd3297749375bcf8206715f54fe648088335a9 0xaa3b3450295830d2de6db90caba67be5a5795889"
-POWERSHELL_ARCHIVE_ARCHITECTURES="amd64"
-POWERSHELL_ARCHIVE_VERSION_CODENAMES="stretch buster bionic focal bullseye jammy"
-AZCLI_ARCHIVE_ARCHITECTURES="amd64"
-AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
-DOTNET_ARCHIVE_ARCHITECTURES="amd64"
-DOTNET_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute jammy"
-DOTNET_VERSION_CODENAMES_REQUIRE_OLDER_LIBSSL_1="buster bullseye bionic focal hirsute"
-DOTNET_CDN_FEED_URI="https://dotnetcli.azureedge.net"
-HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
-MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-TFLINT_GPG_KEY_URI="https://raw.githubusercontent.com/terraform-linters/tflint/master/8CE69160EB3F2FE9.key"
-GO_GPG_KEY_URI="https://dl.google.com/linux/linux_signing_key.pub"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
-keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
-AWSCLI_GPG_KEY=FB5DB77FD5C118B80511ADA8A6310ACC4672475C
-AWSCLI_GPG_KEY_MATERIAL="-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBF2Cr7UBEADJZHcgusOJl7ENSyumXh85z0TRV0xJorM2B/JL0kHOyigQluUG
-ZMLhENaG0bYatdrKP+3H91lvK050pXwnO/R7fB/FSTouki4ciIx5OuLlnJZIxSzx
-PqGl0mkxImLNbGWoi6Lto0LYxqHN2iQtzlwTVmq9733zd3XfcXrZ3+LblHAgEt5G
-TfNxEKJ8soPLyWmwDH6HWCnjZ/aIQRBTIQ05uVeEoYxSh6wOai7ss/KveoSNBbYz
-gbdzoqI2Y8cgH2nbfgp3DSasaLZEdCSsIsK1u05CinE7k2qZ7KgKAUIcT/cR/grk
-C6VwsnDU0OUCideXcQ8WeHutqvgZH1JgKDbznoIzeQHJD238GEu+eKhRHcz8/jeG
-94zkcgJOz3KbZGYMiTh277Fvj9zzvZsbMBCedV1BTg3TqgvdX4bdkhf5cH+7NtWO
-lrFj6UwAsGukBTAOxC0l/dnSmZhJ7Z1KmEWilro/gOrjtOxqRQutlIqG22TaqoPG
-fYVN+en3Zwbt97kcgZDwqbuykNt64oZWc4XKCa3mprEGC3IbJTBFqglXmZ7l9ywG
-EEUJYOlb2XrSuPWml39beWdKM8kzr1OjnlOm6+lpTRCBfo0wa9F8YZRhHPAkwKkX
-XDeOGpWRj4ohOx0d2GWkyV5xyN14p2tQOCdOODmz80yUTgRpPVQUtOEhXQARAQAB
-tCFBV1MgQ0xJIFRlYW0gPGF3cy1jbGlAYW1hem9uLmNvbT6JAlQEEwEIAD4WIQT7
-Xbd/1cEYuAURraimMQrMRnJHXAUCXYKvtQIbAwUJB4TOAAULCQgHAgYVCgkICwIE
-FgIDAQIeAQIXgAAKCRCmMQrMRnJHXJIXEAChLUIkg80uPUkGjE3jejvQSA1aWuAM
-yzy6fdpdlRUz6M6nmsUhOExjVIvibEJpzK5mhuSZ4lb0vJ2ZUPgCv4zs2nBd7BGJ
-MxKiWgBReGvTdqZ0SzyYH4PYCJSE732x/Fw9hfnh1dMTXNcrQXzwOmmFNNegG0Ox
-au+VnpcR5Kz3smiTrIwZbRudo1ijhCYPQ7t5CMp9kjC6bObvy1hSIg2xNbMAN/Do
-ikebAl36uA6Y/Uczjj3GxZW4ZWeFirMidKbtqvUz2y0UFszobjiBSqZZHCreC34B
-hw9bFNpuWC/0SrXgohdsc6vK50pDGdV5kM2qo9tMQ/izsAwTh/d/GzZv8H4lV9eO
-tEis+EpR497PaxKKh9tJf0N6Q1YLRHof5xePZtOIlS3gfvsH5hXA3HJ9yIxb8T0H
-QYmVr3aIUes20i6meI3fuV36VFupwfrTKaL7VXnsrK2fq5cRvyJLNzXucg0WAjPF
-RrAGLzY7nP1xeg1a0aeP+pdsqjqlPJom8OCWc1+6DWbg0jsC74WoesAqgBItODMB
-rsal1y/q+bPzpsnWjzHV8+1/EtZmSc8ZUGSJOPkfC7hObnfkl18h+1QtKTjZme4d
-H17gsBJr+opwJw/Zio2LMjQBOqlm3K1A4zFTh7wBC7He6KPQea1p2XAMgtvATtNe
-YLZATHZKTJyiqA==
-=vYOk
-----END PGP PUBLIC KEY BLOCK-----"
-DOCKER_IN_DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
-DOCKER_IN_DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute impish jammy"
\ No newline at end of file
--- a/lib/utils.sh
+++ b/lib/utils.sh
--- a/v1/README.md
+++ b/v1/README.md
-Files in this folder are designed for back-compat with 'v1'
-while waiting 'v2' implementation: https://github.com/devcontainers/cli/pull/6
--- a/v1/combine-feature-fragments.py
+++ b/v1/combine-feature-fragments.py
-#!/usr/bin/env python3
-
-# Run from repo root.
-
-import os
-
-featureDirs = os.listdir('./src')
-
-beginning = """
-{
-	"features": [
-"""
-
-middle = ""
-
-end = """
-	]
-}
-"""
-
-count = len(featureDirs)
-
-for fDir in featureDirs:
-    count -= 1
-    config = f'./src/{fDir}/feature.json'
-    data = open(config, "r").read()
-    middle += f'{data}'
-    if count != 0:
-        middle += ','
-    middle += '\n'
-
-print(f'{beginning}{middle}{end}')
--- a/v1/feature-scripts.env
+++ b/v1/feature-scripts.env
-_BUILD_ARG_COMMON="./common/install.sh                                      ${_BUILD_ARG_COMMON_INSTALLZSH:-true} ${_BUILD_ARG_COMMON_USERNAME:-automatic} ${_BUILD_ARG_COMMON_UID:-automatic} ${_BUILD_ARG_COMMON_GID:-automatic} ${_BUILD_ARG_COMMON_UPGRADEPACKAGES:-true} ${_BUILD_ARG_COMMON_INSTALLOHMYZSH:-true} ${_BUILD_ARG_COMMON_NONFREEPACKAGES:-false}"
-_BUILD_ARG_GIT="./git/install.sh                                            ${_BUILD_ARG_GIT_VERSION:-latest} ${_BUILD_ARG_GIT_PPA:-true}"
-_BUILD_ARG_GIT_LFS="./git-lfs/install.sh                                    ${_BUILD_ARG_GIT_LFS_VERSION:-latest}"
-_BUILD_ARG_DOCKER_IN_DOCKER="./docker-in-docker/install.sh                  true automatic ${_BUILD_ARG_DOCKER_IN_DOCKER_MOBY:-true} ${_BUILD_ARG_DOCKER_IN_DOCKER_VERSION:-latest} ${_BUILD_ARG_DOCKER_IN_DOCKER_DOCKERDASHCOMPOSEVERSION:-v1}"
-_BUILD_ARG_DOCKER_FROM_DOCKER="./docker-from-docker/install.sh              true /var/run/docker-host.sock /var/run/docker.sock automatic ${_BUILD_ARG_DOCKER_FROM_DOCKER_MOBY:-true} ${_BUILD_ARG_DOCKER_FROM_DOCKER_VERSION:-latest} ${_BUILD_ARG_DOCKER_FROM_DOCKER_DOCKERDASHCOMPOSEVERSION:-v1}"
-_BUILD_ARG_KUBECTL_HELM_MINIKUBE="./kubectl-helm-minikube/install.sh          ${_BUILD_ARG_KUBECTL_HELM_MINIKUBE_VERSION:-latest} ${_BUILD_ARG_KUBECTL_HELM_MINIKUBE_HELM:-latest} ${_BUILD_ARG_KUBECTL_HELM_MINIKUBE_MINIKUBE:-latest}"
-_BUILD_ARG_TERRAFORM="./terraform/install.sh                                ${_BUILD_ARG_TERRAFORM_VERSION:-latest} ${_BUILD_ARG_TERRAFORM_TFLINT:-latest} ${_BUILD_ARG_TERRAFORM_TERRAGRUNT:-latest}"
-_BUILD_ARG_GITHUB_CLI="./github-cli/install.sh                              ${_BUILD_ARG_GITHUB_CLI_VERSION:-latest}"
-_BUILD_ARG_AWS_CLI="./aws-cli/install.sh                                    ${_BUILD_ARG_AWS_CLI_VERSION:-latest}"
-_BUILD_ARG_AZURE_CLI="./az-cli/install.sh                                   ${_BUILD_ARG_AZURE_CLI_VERSION:-latest}"
-_BUILD_ARG_SSHD="./sshd/install.sh"
-_BUILD_ARG_NODE="./node/install.sh                                          ${_BUILD_ARG_NODE_NVMINSTALLPATH:-/usr/local/share/nvm} ${_BUILD_ARG_NODE_VERSION:-lts/*} automatic true ${_BUILD_ARG_NODE_NODEGYPDEPENDENCIES:-true}"
-_BUILD_ARG_PYTHON="./python/install.sh                                      ${_BUILD_ARG_PYTHON_VERSION:-latest} ${_BUILD_ARG_PYTHON_INSTALLPATH:-/usr/local/python} /usr/local/py-utils automatic true ${_BUILD_ARG_PYTHON_INSTALLTOOLS:-true} true ${_BUILD_ARG_PYTHON_OPTIMIZE:-false} ${_BUILD_ARG_PYTHON_OVERRIDEDEFAULTVERSION:-true} ${_BUILD_ARG_PYTHON_INSTALLJUPYTERLAB:-false} ${_BUILD_ARG_PYTHON_CONFIGUREJUPYTERLABALLOWORIGIN:-''}"
-_BUILD_ARG_GO="./go/install.sh                                              ${_BUILD_ARG_GOLANG_VERSION:-latest}"
-_BUILD_ARG_JAVA="./java/wrapper.sh                                          ${_BUILD_ARG_JAVA_VERSION:-latest}"
-_BUILD_ARG_GRADLE="./gradle/install.sh                                      ${_BUILD_ARG_GRADLE_VERSION:-latest}"
-_BUILD_ARG_MAVEN="./maven/install.sh                                        ${_BUILD_ARG_MAVEN_VERSION:-latest}"
-_BUILD_ARG_RUBY="./ruby/install.sh                                          ${_BUILD_ARG_RUBY_VERSION:-latest}"
-_BUILD_ARG_RUST="./rust/install.sh                                          /usr/local/cargo /usr/local/rustup automatic true false ${_BUILD_ARG_RUST_VERSION:-latest} ${_BUILD_ARG_RUST_PROFILE:-minimal}"
-_BUILD_ARG_POWERSHELL="./powershell/install.sh                              ${_BUILD_ARG_POWERSHELL_VERSION:-latest}"
-_BUILD_ARG_DESKTOP_LITE="./desktop-lite/install.sh                          automatic ${_BUILD_ARG_DESKTOP_LITE_PASSWORD:-vscode} true ${_BUILD_ARG_DESKTOP_LITE_VNCPORT:-5901} ${_BUILD_ARG_DESKTOP_LITE_WEBPORT:-6080}"
-_BUILD_ARG_DOTNET="./dotnet/install.sh                                      ${_BUILD_ARG_DOTNET_VERSION:-latest} ${_BUILD_ARG_DOTNET_RUNTIMEONLY:-false} automatic true /usr/local/dotnet dotnet ${_BUILD_ARG_DOTNET_OVERRIDEDEFAULTVERSION:-true}  ${_BUILD_ARG_DOTNET_INSTALLUSINGAPT:-true}"
-_BUILD_ARG_PHP="./php/install.sh                                            ${_BUILD_ARG_PHP_VERSION:-latest} /usr/local/php ${_BUILD_ARG_PHP_INSTALLCOMPOSER:-true} automatic true ${_BUILD_ARG_PHP_OVERRIDEDEFAULTVERSION:-true}"
-_BUILD_ARG_ORYX="./oryx/install.sh                                          automatic true"
-_BUILD_ARG_HUGO="./hugo/install.sh                                          ${_BUILD_ARG_HUGO_VERSION:-latest} automatic true"
-_BUILD_ARG_ANACONDA="./anaconda/install.sh                                  ${_BUILD_ARG_ANACONDA_VERSION:-latest} automatic true"
\ No newline at end of file
--- a/v1/install.sh
+++ b/v1/install.sh
-#!/usr/bin/env bash
-
-# Support 'v1' dev container feature installation 
-# that require a root 'install.sh' script.
-
-set -e
-cd "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# Verify we're on a supported OS
-. /etc/os-release
-if [ "${ID}" != "debian" ] &&  [ "${ID_LIKE}" != "debian" ]; then
-cat << EOF
-
-*********** Unsupported operating system "${ID}" detected ***********
-
-Features support currently requires a Debian/Ubuntu-based image. Update your 
-image or Dockerfile FROM statement to start with a supported OS. For example:
-mcr.microsoft.com/vscode/devcontainers/base:ubuntu
-
-Aborting build...
-
-EOF
-    exit 2
-fi
-
-set -a
-. ./devcontainer-features.env
-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%\"}"
-        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
-            script_name="$(echo $script_command | cut -d' ' -f1)"
-            chmod +x ${script_name}
-            ./${script_command}
-            echo "${script_command}" > "${feature_marker}"
-        fi
-    fi
-done < ./feature-scripts.env
-
-# Clean up
-apt-get autoremove -y
-apt-get clean -y
-rm -rf /var/lib/apt/lists/*