Merge branch 'main' into feature/pre-commit-hook_support_1138

Author: gvatsal60

.github/workflows/test-all.yaml

@@ -17,6 +17,7 @@ jobs:
             "azure-cli",
             "common-utils",
             "conda",
+            "copilot-cli",
             "desktop-lite",
             "docker-outside-of-docker",
             "docker-in-docker",
@@ -70,6 +71,7 @@ jobs:
             "azure-cli",
             "common-utils",
             "conda",
+            "copilot-cli",
             "desktop-lite",
             "docker-outside-of-docker",
             "docker-in-docker",

.github/workflows/test-pr.yaml

@@ -17,6 +17,7 @@ jobs:
             azure-cli: ./**/azure-cli/**
             common-utils: ./**/common-utils/**
             conda: ./**/conda/**
+            copilot-cli: ./**/copilot-cli/**
             desktop-lite: ./**/desktop-lite/**
             docker-outside-of-docker: ./**/docker-outside-of-docker/**
             docker-in-docker: ./**/docker-in-docker/**

src/common-utils/README.md

@@ -38,7 +38,7 @@ these images have already allocated UID & GID 1000. Attempting to add this Featu
 
 By default, this script provides a custom command prompt that includes information about the git repository for the current folder. However, with certain large repositories, this can result in a slow command prompt due to the performance of needed git operations.
 
-For performance reasons, a "dirty" indicator that tells you whether or not there are uncommitted changes is disabled by default. You can opt to turn this on for smaller repositories by entering the following in a terminal or adding it to your `postCreateCommand`:
+For performance reasons, a "dirty" indicator that tells you whether or not there are uncommitted changes is disabled by default. You can opt to turn this on for smaller repositories by entering the following in a terminal or adding it to your `postStartCommand`:
 
 ```bash
 git config devcontainers-theme.show-dirty 1

src/common-utils/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.4",
+    "version": "2.5.5",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
@@ -64,6 +64,11 @@
             "type": "boolean",
             "default": false,
             "description": "Add packages from non-free Debian repository? (Debian only)"
+        },
+        "installSsl": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install SSL?"
         }
     }
 }

src/common-utils/install.sh

@@ -18,6 +18,7 @@ USERNAME="${USERNAME:-"automatic"}"
 USER_UID="${UID:-"automatic"}"
 USER_GID="${GID:-"automatic"}"
 ADD_NON_FREE_PACKAGES="${NONFREEPACKAGES:-"false"}"
+INSTALL_SSL="${INSTALLSSL:-"true"}"
 
 MARKER_FILE="/usr/local/etc/vscode-dev-containers/common"
 

src/common-utils/main.sh

@@ -18,6 +18,7 @@ USERNAME="${USERNAME:-"automatic"}"
 USER_UID="${USERUID:-"automatic"}"
 USER_GID="${USERGID:-"automatic"}"
 ADD_NON_FREE_PACKAGES="${NONFREEPACKAGES:-"false"}"
+INSTALL_SSL="${INSTALLSSL:-"true"}"
 
 MARKER_FILE="/usr/local/etc/vscode-dev-containers/common"
 
@@ -75,25 +76,27 @@ install_debian_packages() {
         manpages-dev \
         init-system-helpers"
 
-        # Include libssl1.1 if available
-        if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
-            package_list="${package_list} libssl1.1"
-        fi
+        if [ "${INSTALL_SSL}" = "true" ]; then
+            # Include libssl1.1 if available
+            if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
+                package_list="${package_list} libssl1.1"
+            fi
 
-        # Include libssl3 if available
-        if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
-            package_list="${package_list} libssl3"
-        fi
+            # Include libssl3 if available
+            if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
+                package_list="${package_list} libssl3"
+            fi
 
-        # Include appropriate version of libssl1.0.x if available
-        local libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
-        if [ "$(echo "$libssl_package" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
-            if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
-                # Debian 9
-                package_list="${package_list} libssl1.0.2"
-            elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
-                # Ubuntu 18.04
-                package_list="${package_list} libssl1.0.0"
+            # Include appropriate version of libssl1.0.x if available
+            local libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
+            if [ "$(echo "$libssl_package" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
+                if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
+                    # Debian 9
+                    package_list="${package_list} libssl1.0.2"
+                elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
+                    # Ubuntu 18.04
+                    package_list="${package_list} libssl1.0.0"
+                fi
             fi
         fi
 
@@ -172,7 +175,7 @@ install_redhat_packages() {
     else
        echo "Unable to find 'tdnf', 'dnf', or 'yum' package manager. Exiting."
        exit 1
-fi
+    fi
 
     if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         package_list="${package_list} \
@@ -228,7 +231,7 @@ fi
         fi
 
         # Install EPEL repository if needed (required to install 'jq' for CentOS)
-        if ! ${install_cmd} -q list jq >/dev/null 2>&1; then
+        if [[ "${ID}" = "centos" ]] && ! rpm -q jq >/dev/null 2>&1; then
             ${install_cmd} -y install epel-release
             remove_epel="true"
         fi
@@ -240,11 +243,18 @@ fi
     fi
 
     if [ -n "${package_list}" ]; then
-        ${install_cmd} -y install ${package_list}
+        echo "Packages to verify are installed: ${package_list}"
+        echo "Running ${install_cmd} install..."
+        if [ "${install_cmd}" = "dnf" ]; then
+            ${install_cmd} -y install --allowerasing ${package_list}
+        else
+            ${install_cmd} -y install ${package_list}
+        fi
     fi
 
     # Get to latest versions of all packages
     if [ "${UPGRADE_PACKAGES}" = "true" ]; then
+        echo "Running ${install_cmd} upgrade..."
         ${install_cmd} upgrade -y
     fi
 

src/copilot-cli/NOTES.md

@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions.
+
+`bash` is required to execute the `install.sh` script.

src/copilot-cli/README.md

@@ -0,0 +1,31 @@
+
+# GitHub Copilot CLI (copilot-cli)
+
+Installs the GitHub Copilot CLI. Auto-detects latest version and installs needed dependencies.
+
+## Example Usage
+
+```json
+"features": {
+    "ghcr.io/devcontainers/features/copilot-cli:1": {}
+}
+```
+
+## Options
+
+| Options Id | Description | Type | Default Value |
+|-----|-----|-----|-----|
+| version | Select version of the GitHub Copilot CLI, if not latest. | string | latest |
+
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions.
+
+`bash` is required to execute the `install.sh` script.
+
+
+---
+
+_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/copilot-cli/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._

src/copilot-cli/devcontainer-feature.json

@@ -0,0 +1,33 @@
+{
+    "id": "copilot-cli",
+    "version": "1.0.0",
+    "name": "GitHub Copilot CLI",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/copilot-cli",
+    "description": "Installs the GitHub Copilot CLI.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "prerelease"
+            ],
+            "default": "latest",
+            "description": "Select version of the GitHub Copilot CLI, if not latest."
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the GitHub Copilot CLI (`copilot`), which is pre-installed and available on the `PATH`."
+                    }
+                ]
+            }
+        }
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
+}
+

src/copilot-cli/install.sh

@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+# Docs: https://github.com/devcontainers/features/blob/main/src/copilot-cli/README.md
+# Maintainer: The VS Code and Codespaces Teams
+
+CLI_VERSION=${VERSION:-"latest"}
+
+set -e
+
+if [ "$(id -u)" -ne 0 ]; then
+    echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
+    exit 1
+fi
+
+apt_get_update() {
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
+}
+
+# Checks if packages are installed and installs them if not
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        apt_get_update
+        apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+download_from_github() {
+    local release_url=$1
+    echo "Downloading GitHub Copilot CLI from ${release_url}..."
+
+    mkdir -p /tmp/copilotcli
+    pushd /tmp/copilotcli
+    wget --show-progress --progress=dot:giga ${release_url}
+    # curl -fL# -O ${release_url}
+    tar -xzf /tmp/copilotcli/${cli_filename}
+    mv copilot /usr/local/bin/copilot
+    popd
+    rm -rf /tmp/copilotcli
+}
+
+install_using_github() {
+    check_packages wget tar ca-certificates git
+    echo "Finished setting up dependencies"
+    arch=$(dpkg --print-architecture)
+    if [ "${arch}" = "amd64" ]; then
+        arch="x64"
+    fi
+    if [ "${arch}" != "x64" ] && [ "${arch}" != "arm64" ]; then
+        echo "Unsupported architecture: ${arch}" >&2
+        exit 1
+    fi
+    cli_filename="copilot-linux-${arch}.tar.gz"
+    echo "Installing GitHub Copilot CLI for ${arch} architecture: ${cli_filename}"
+
+    # Install latest
+    if [ "${CLI_VERSION}" = "latest" ]; then
+        download_from_github "https://github.com/github/copilot-cli/releases/latest/download/${cli_filename}"
+    elif [ "${CLI_VERSION}" = "prerelease" ]; then
+        prerelease_version="$(git ls-remote --tags https://github.com/github/copilot-cli | tail -1 | awk -F/ '{print $NF}')"
+        download_from_github "https://github.com/github/copilot-cli/releases/download/${prerelease_version}/${cli_filename}"
+    else
+        # Install specific version
+        # Add leading v to version if it doesn't start with v
+        if [[ ! "${CLI_VERSION}" =~ ^v[0-9] ]]; then
+            CLI_VERSION="v${CLI_VERSION}"
+        fi
+        download_from_github "https://github.com/github/copilot-cli/releases/download/${CLI_VERSION}/${cli_filename}"
+    fi
+}
+
+# Install the GitHub Copilot CLI
+echo "Downloading GitHub Copilot CLI..."
+
+install_using_github
+