Skip to content

Commit 93011a0

Browse files
Kaniska244Kaniska244
authored
Merge branch 'main' into Python-EOL-3.8
2 parents 2622040 + 4f8a62a commit 93011a0

78 files changed

Lines changed: 1216 additions & 286 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/anaconda/devcontainer-feature.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "anaconda",
3-
"version": "1.0.12",
3+
"version": "1.0.13",
44
"name": "Anaconda",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
66
"options": {
@@ -17,6 +17,17 @@
1717
"CONDA_DIR": "/usr/local/conda",
1818
"PATH": "/usr/local/conda/bin:${PATH}"
1919
},
20+
"customizations": {
21+
"vscode": {
22+
"settings": {
23+
"github.copilot.chat.codeGeneration.instructions": [
24+
{
25+
"text": "This dev container includes Anaconda and the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
26+
}
27+
]
28+
}
29+
}
30+
},
2031
"installsAfter": [
2132
"ghcr.io/devcontainers/features/common-utils"
2233
]

‎src/aws-cli/devcontainer-feature.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "aws-cli",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"name": "AWS CLI",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/aws-cli",
66
"description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -18,7 +18,14 @@
1818
"vscode": {
1919
"extensions": [
2020
"AmazonWebServices.aws-toolkit-vscode"
21-
]
21+
],
22+
"settings": {
23+
"github.copilot.chat.codeGeneration.instructions": [
24+
{
25+
"text": "This dev container includes the AWS CLI along with needed dependencies pre-installed and available on the `PATH`, along with the AWS Toolkit extensions for AWS development."
26+
}
27+
]
28+
}
2229
}
2330
},
2431
"installsAfter": [

‎src/aws-cli/install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ check_packages() {
6868

6969
export DEBIAN_FRONTEND=noninteractive
7070

71-
check_packages curl ca-certificates gnupg2 dirmngr unzip bash-completion
71+
check_packages curl ca-certificates gnupg2 dirmngr unzip bash-completion less
7272

7373
verify_aws_cli_gpg_signature() {
7474
local filePath=$1

‎src/azure-cli/devcontainer-feature.json‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "azure-cli",
3-
"version": "1.2.5",
3+
"version": "1.2.7",
44
"name": "Azure CLI",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
66
"description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -23,6 +23,14 @@
2323
"description": "Optionally install Azure Bicep",
2424
"default": false
2525
},
26+
"bicepVersion": {
27+
"type": "string",
28+
"proposals": [
29+
"latest"
30+
],
31+
"default": "latest",
32+
"description": "Select or enter a Bicep version. ('latest' or a specic version such as 'v0.31.92')"
33+
},
2634
"installUsingPython": {
2735
"type": "boolean",
2836
"description": "Install Azure CLI using Python instead of pipx",
@@ -33,7 +41,14 @@
3341
"vscode": {
3442
"extensions": [
3543
"ms-vscode.azurecli"
36-
]
44+
],
45+
"settings": {
46+
"github.copilot.chat.codeGeneration.instructions": [
47+
{
48+
"text": "This dev container includes the Azure CLI along with needed dependencies pre-installed and available on the `PATH`, along with the Azure CLI extension for Azure development."
49+
}
50+
]
51+
}
3752
}
3853
},
3954
"installsAfter": [

‎src/azure-cli/install.sh‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ rm -rf /var/lib/apt/lists/*
1515
AZ_VERSION=${VERSION:-"latest"}
1616
AZ_EXTENSIONS=${EXTENSIONS}
1717
AZ_INSTALLBICEP=${INSTALLBICEP:-false}
18+
AZ_BICEPVERSION=${BICEPVERSION:-latest}
1819
INSTALL_USING_PYTHON=${INSTALLUSINGPYTHON:-false}
1920
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
2021
AZCLI_ARCHIVE_ARCHITECTURES="amd64 arm64"
@@ -229,10 +230,16 @@ if [ "${AZ_INSTALLBICEP}" = "true" ]; then
229230
# The `az bicep install --target-platform` could be a solution; however, linux-arm64 is not an allowed value for this argument yet
230231
# Manually installing Bicep and moving to the appropriate directory where az expects it to be
231232

233+
if [ "${AZ_BICEPVERSION}" = "latest" ]; then
234+
bicep_download_path="https://github.com/Azure/bicep/releases/latest/download"
235+
else
236+
bicep_download_path="https://github.com/Azure/bicep/releases/download/${AZ_BICEPVERSION}"
237+
fi
238+
232239
if [ "${architecture}" = "arm64" ]; then
233-
curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-arm64
240+
curl -Lo bicep ${bicep_download_path}/bicep-linux-arm64
234241
else
235-
curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64
242+
curl -Lo bicep ${bicep_download_path}/bicep-linux-x64
236243
fi
237244

238245
chmod +x ./bicep

‎src/common-utils/devcontainer-feature.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "common-utils",
3-
"version": "2.5.2",
3+
"version": "2.5.3",
44
"name": "Common Utilities",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
66
"description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

‎src/common-utils/install.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ fi
3131
if [ "${ID}" = "alpine" ]; then
3232
apk add --no-cache bash
3333
fi
34-
34+
if [ "${ID}" = "azurelinux" ]; then
35+
tdnf install -y curl git
36+
fi
3537
exec /bin/bash "$(dirname $0)/main.sh" "$@"
3638
exit $?

‎src/common-utils/main.sh‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,18 @@ install_redhat_packages() {
161161
local package_list=""
162162
local remove_epel="false"
163163
local install_cmd=microdnf
164-
if ! type microdnf > /dev/null 2>&1; then
165-
install_cmd=dnf
166-
if ! type dnf > /dev/null 2>&1; then
167-
install_cmd=yum
168-
fi
169-
fi
164+
if type microdnf > /dev/null 2>&1; then
165+
install_cmd=microdnf
166+
elif type tdnf > /dev/null 2>&1; then
167+
install_cmd=tdnf
168+
elif type dnf > /dev/null 2>&1; then
169+
install_cmd=dnf
170+
elif type yum > /dev/null 2>&1; then
171+
install_cmd=yum
172+
else
173+
echo "Unable to find 'tdnf', 'dnf', or 'yum' package manager. Exiting."
174+
exit 1
175+
fi
170176

171177
if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
172178
package_list="${package_list} \
@@ -344,7 +350,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
344350
# Get an adjusted ID independent of distro variants
345351
if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
346352
ADJUSTED_ID="debian"
347-
elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
353+
elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "azurelinux" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
348354
ADJUSTED_ID="rhel"
349355
VERSION_CODENAME="${ID}${VERSION_ID}"
350356
elif [ "${ID}" = "alpine" ]; then

‎src/conda/devcontainer-feature.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "conda",
3-
"version": "1.0.9",
3+
"version": "1.0.10",
44
"name": "Conda",
55
"description": "A cross-platform, language-agnostic binary package manager",
66
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
@@ -26,6 +26,17 @@
2626
"CONDA_SCRIPT":"/opt/conda/etc/profile.d/conda.sh",
2727
"PATH": "/opt/conda/bin:${PATH}"
2828
},
29+
"customizations": {
30+
"vscode": {
31+
"settings": {
32+
"github.copilot.chat.codeGeneration.instructions": [
33+
{
34+
"text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
35+
}
36+
]
37+
}
38+
}
39+
},
2940
"installsAfter": [
3041
"ghcr.io/devcontainers/features/common-utils"
3142
]

‎src/desktop-lite/devcontainer-feature.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "desktop-lite",
3-
"version": "1.2.5",
3+
"version": "1.2.6",
44
"name": "Light-weight Desktop",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
66
"description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
@@ -54,6 +54,17 @@
5454
"containerEnv": {
5555
"DISPLAY": ":1"
5656
},
57+
"customizations": {
58+
"vscode": {
59+
"settings": {
60+
"github.copilot.chat.codeGeneration.instructions": [
61+
{
62+
"text": "This dev container includes a lightweight Fluxbox based desktop that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS Code terminal will open on the desktop automatically."
63+
}
64+
]
65+
}
66+
}
67+
},
5768
"installsAfter": [
5869
"ghcr.io/devcontainers/features/common-utils"
5970
]

0 commit comments

Comments
 (0)