Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit ac43b05

Browse files
committed
More updates for renames (#1267)
1 parent 38127c7 commit ac43b05

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/push-and-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,5 +195,5 @@ jobs:
195195
with:
196196
allowUpdates: true # Lets us upload our own artifact from previous step
197197
artifactErrorsFailBuild: true
198-
artifacts: './features.tgz'
198+
artifacts: './devcontainer-features.tgz'
199199
token: ${{ secrets.GITHUB_TOKEN }}

script-library/container-features/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This folder includes some explorations around dynamic container feature injectio
1010

1111
Create the install script in the [script-library](../../script-library/) directory with the naming convention `<lowercase-feature-name>-<target-os>.sh`. EG `python-debian.sh` or `common-alpine.sh`
1212

13-
Add a new object to the [features.json](../../script-library/container-features/src/features.json) file:
13+
Add a new object to the [devcontainer-features.json](../../script-library/container-features/src/devcontainer-features.json) file:
1414

1515
```json
1616
{
@@ -42,7 +42,7 @@ Add your buildArg to the [feature-scripts.env](../../script-library/container-fe
4242
_VSC_INSTALL_<FEATURE>="<feature>-debian.sh ${_BUILD_ARG_<FEATURE>_<OPTION1>:-<option1 default>} ${_BUILD_ARG_<FEATURE>_<OPTION2>:-<option2 default>} hardcodedThirdArgument"
4343
```
4444

45-
- Options declared in `features.json` are mapped using the naming convention `_BUILD_ARG_<FEATURE>_<OPTIONNAME>` and their default should match the declared default for that option.
45+
- Options declared in `devcontainer-features.json` are mapped using the naming convention `_BUILD_ARG_<FEATURE>_<OPTIONNAME>` and their default should match the declared default for that option.
4646
- EG `_VSC_INSTALL_AZURE_CLI="azcli-debian.sh ${_BUILD_ARG_AZURE_CLI_VERSION:-latest}"`
4747

4848
**Feature testing**

script-library/container-features/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fi
2424
docker buildx build --progress plain --load ${PLATFORMS_ARG} --build-arg BASE_IMAGE=$IMAGE_TO_TEST -t container-features-regression -f test.Dockerfile out
2525
docker run --init --privileged container-features-regression bash -c 'uname -m && env'
2626

27-
# Remove features.env from out folder so we can use it to test the VS Code extension
28-
rm -f out/features.env
27+
# Remove devcontainer-features.env from out folder so we can use it to test the VS Code extension
28+
rm -f out/devcontainer-features.env
2929

3030
echo -e "\n🎉 All tests passed!"

0 commit comments

Comments
 (0)