Skip to content

Properly source feature options #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshspicer merged 5 commits into from
Aug 31, 2022
Merged

Properly source feature options #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ff6b0c
capture issue in tests
joshspicer Aug 30, 2022
790a4eb
fixes https://github.com/devcontainers/cli/issues/148 and updates test
joshspicer Aug 30, 2022
15d222a
update similar test
joshspicer Aug 30, 2022
05be4f4
update install script
joshspicer Aug 30, 2022
70db802
set -a
joshspicer Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/spec-configuration/containerFeaturesConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,9 @@ export function getFeatureLayers(featuresConfig: FeaturesConfig) {
result += `

RUN cd /tmp/build-features/${feature.consecutiveId} \\
&& export $(cat devcontainer-features.env | xargs) \\
&& set -a \\
&& . ./devcontainer-features.env \\
Comment thread
joshspicer marked this conversation as resolved.
&& set +a \\
&& chmod +x ./install.sh \\
&& ./install.sh

Expand Down
3 changes: 2 additions & 1 deletion ...ures/configs/dockerfile-with-v2-local-features-no-dev-container-folder/.devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
},
"features": {
"./local-features/localFeatureA": {
"greeting": "buongiorno"
"greeting": "Hello there",
"punctuation": "!!!!"
},
"./local-features/localFeatureB": {
"favorite": "gold"
Expand Down
3 changes: 2 additions & 1 deletion ...le-with-v2-local-features-no-dev-container-folder/local-features/localFeatureA/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
echo "Activating feature 'localFeatureA'"

GREETING=${GREETING:-undefined}
PUNCTUATION=${PUNCTUATION:-?????}
echo "The provided greeting is: $GREETING"

tee /usr/hello.sh > /dev/null \
<< EOF
#!/bin/bash
RED='\033[0;91m'
NC='\033[0m' # No Color
echo -e -n "\${RED}${GREETING}, \$(whoami)!"
echo -e -n "\${RED}${GREETING}, \$(whoami)${PUNCTUATION}"
echo -e -n "\${NC}"
EOF

Expand Down
3 changes: 2 additions & 1 deletion ...ckerfile-with-v2-local-features-with-dev-container-folder/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
},
"features": {
"./local-features/localFeatureA": {
"greeting": "buongiorno"
"greeting": "Hello there",
"punctuation": "!!!!"
},
"./local-features/localFeatureB": {
"favorite": "gold"
Expand Down
3 changes: 2 additions & 1 deletion ...-with-v2-local-features-with-dev-container-folder/local-features/localFeatureA/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
echo "Activating feature 'localFeatureA'"

GREETING=${GREETING:-undefined}
PUNCTUATION=${PUNCTUATION:-?????}
echo "The provided greeting is: $GREETING"

tee /usr/hello.sh > /dev/null \
<< EOF
#!/bin/bash
RED='\033[0;91m'
NC='\033[0m' # No Color
echo -e -n "\${RED}${GREETING}, \$(whoami)!"
echo -e -n "\${RED}${GREETING}, \$(whoami)${PUNCTUATION}"
echo -e -n "\${NC}"
EOF

Expand Down
4 changes: 2 additions & 2 deletions src/test/container-features/e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ describe('Dev Container Features E2E (local-path)', function () {
const response = JSON.parse(res.stdout);
console.log(res.stderr);
assert.equal(response.outcome, 'success');
assert.match(res.stderr, /buongiorno, root!/);
assert.match(res.stderr, /Hello there, root!!!!/);
});

it('should read configuration with features', async () => {
Expand Down Expand Up @@ -201,7 +201,7 @@ describe('Dev Container Features E2E (local-path)', function () {
const response = JSON.parse(res.stdout);
console.log(res.stderr);
assert.equal(response.outcome, 'success');
assert.match(res.stderr, /buongiorno, root!/);
assert.match(res.stderr, /Hello there, root!!!!/);
});

it('should read configuration with features with customizations', async () => {
Expand Down