Skip to content

Commit 754b924

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/checkout-6
2 parents 115a258 + b5b41d8 commit 754b924

42 files changed

Lines changed: 397 additions & 263 deletions

Some content is hidden

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

src/aws-cli/devcontainer-feature.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "aws-cli",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
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.",
@@ -12,6 +12,11 @@
1212
],
1313
"default": "latest",
1414
"description": "Select or enter an AWS CLI version."
15+
},
16+
"verbose": {
17+
"type": "boolean",
18+
"default": true,
19+
"description": "Suppress verbose output."
1520
}
1621
},
1722
"customizations": {

src/aws-cli/install.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ set -e
1313
rm -rf /var/lib/apt/lists/*
1414

1515
VERSION=${VERSION:-"latest"}
16+
VERBOSE=${VERBOSE:-"true"}
1617

1718
AWSCLI_GPG_KEY=FB5DB77FD5C118B80511ADA8A6310ACC4672475C
1819
AWSCLI_GPG_KEY_MATERIAL="-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -110,7 +111,12 @@ install() {
110111
exit 1
111112
fi
112113

113-
unzip "${scriptZipFile}"
114+
if [ "${VERBOSE}" = "false" ]; then
115+
unzip -q "${scriptZipFile}"
116+
else
117+
unzip "${scriptZipFile}"
118+
fi
119+
114120
./aws/install
115121

116122
# kubectl bash completion

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.6",
3+
"version": "2.5.7",
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/main.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -378,14 +378,6 @@ if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
378378
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
379379
fi
380380

381-
if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
382-
# As of 1 July 2024, mirrorlist.centos.org no longer exists.
383-
# Update the repo files to reference vault.centos.org.
384-
sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
385-
sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
386-
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
387-
fi
388-
389381
# Install packages for appropriate OS
390382
case "${ADJUSTED_ID}" in
391383
"debian")

src/docker-in-docker/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "docker-in-docker",
3-
"version": "2.16.0",
3+
"version": "2.16.1",
44
"name": "Docker (Docker-in-Docker)",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
66
"description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",

src/docker-in-docker/install.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,10 @@ if [ "$DISABLE_IP6_TABLES" == true ]; then
861861
fi
862862
fi
863863

864+
if [ ! -d /usr/local/share ]; then
865+
mkdir -p /usr/local/share
866+
fi
867+
864868
tee /usr/local/share/docker-init.sh > /dev/null \
865869
<< EOF
866870
#!/bin/sh

src/docker-outside-of-docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
2020
| version | Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.) | string | latest |
2121
| moby | Install OSS Moby build instead of Docker CE | boolean | true |
2222
| mobyBuildxVersion | Install a specific version of moby-buildx when using Moby | string | latest |
23-
| dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none) | string | v2 |
23+
| dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none or latest) | string | latest |
2424
| installDockerBuildx | Install Docker Buildx | boolean | true |
2525
| installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | true |
2626

src/docker-outside-of-docker/devcontainer-feature.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2+
23
"id": "docker-outside-of-docker",
3-
"version": "1.8.0",
4+
"version": "1.9.0",
45
"name": "Docker (docker-outside-of-docker)",
56
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
67
"description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
@@ -29,11 +30,12 @@
2930
"type": "string",
3031
"enum": [
3132
"none",
33+
"latest",
3234
"v1",
3335
"v2"
3436
],
35-
"default": "v2",
36-
"description": "Compose version to use for docker-compose (v1 or v2 or none)"
37+
"default": "latest",
38+
"description": "Compose version to use for docker-compose (v1 or v2 or none or latest)"
3739
},
3840
"installDockerBuildx": {
3941
"type": "boolean",

src/docker-outside-of-docker/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
DOCKER_VERSION="${VERSION:-"latest"}"
1111
USE_MOBY="${MOBY:-"true"}"
1212
MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
13-
DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v2"}" # v1 or v2 or none
13+
DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"latest"}" # v1 or v2 or none or latest
1414

1515
ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
1616
SOURCE_SOCKET="${SOURCE_SOCKET:-"/var/run/docker-host.sock"}"

src/dotnet/NOTES.md

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Installing only the .NET Runtime or the ASP.NET Core Runtime. (The SDK includes
5757
"ghcr.io/devcontainers/features/dotnet:2": {
5858
"version": "none",
5959
"dotnetRuntimeVersions": "latest, lts",
60-
"aspnetCoreRuntimeVersions": "latest, lts",
60+
"aspNetCoreRuntimeVersions": "latest, lts",
6161
}
6262
}
6363
```
@@ -67,7 +67,7 @@ Installing .NET workloads. Multiple workloads can be specified as comma-separate
6767
``` json
6868
"features": {
6969
"ghcr.io/devcontainers/features/dotnet:2": {
70-
"workloads": "aspire, wasm-tools"
70+
"workloads": "wasm-tools"
7171
}
7272
}
7373
```
@@ -80,7 +80,7 @@ Installing prerelease builds. Supports `preview` and `daily` suffixes.
8080
"version": "10.0-preview",
8181
"additionalVersions": "10.0.1xx-daily",
8282
"dotnetRuntimeVersions": "10.0-daily",
83-
"aspnetCoreRuntimeVersions": "10.0-daily"
83+
"aspNetCoreRuntimeVersions": "10.0-daily"
8484
}
8585
}
8686
```
@@ -90,3 +90,21 @@ Installing prerelease builds. Supports `preview` and `daily` suffixes.
9090
This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
9191

9292
`bash` is required to execute the `install.sh` script.
93+
94+
## Tab completions
95+
96+
When using .NET SDK 10 or newer, tab completions for the `dotnet` CLI are automatically installed for bash, zsh, and fish. The completion scripts are placed in the standard system-wide directories so they work for all users:
97+
98+
- **Bash**: `/usr/share/bash-completion/completions/dotnet`
99+
- **Zsh**: `/usr/share/zsh/site-functions/_dotnet`
100+
- **Fish**: `/usr/share/fish/vendor_completions.d/dotnet.fish`
101+
102+
To disable this, set `tabCompletions` to `false`:
103+
104+
``` json
105+
"features": {
106+
"ghcr.io/devcontainers/features/dotnet:2": {
107+
"tabCompletions": false
108+
}
109+
}
110+
```

0 commit comments

Comments
 (0)