Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: set env and run scripts when starting cached image #359

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
merged 7 commits into from
Sep 27, 2024
Merged

fix: set env and run scripts when starting cached image #359

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e8b049
fix: set env and run scripts when starting cached image
mafredri Sep 26, 2024
9c26443
pr fixes
mafredri Sep 27, 2024
8239008
add test to compare built and cached image env
mafredri Sep 27, 2024
ccafa76
test user as well
mafredri Sep 27, 2024
b2041cc
rename vars
mafredri Sep 27, 2024
64e4f05
add missing check
mafredri Sep 27, 2024
84a2b28
Merge branch 'main' into mafredri/fix-cached-image-startup
mafredri Sep 27, 2024
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
Prev Previous commit
Next Next commit
test user as well
  • Loading branch information
@mafredri
mafredri committed Sep 27, 2024
commit ccafa76d4139a0533a9d6e459e619da40d335e6a
10 changes: 8 additions & 2 deletions integration/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,7 +1320,8 @@ RUN date --utc > /root/date.txt`, testImageAlpine),
ctx, cancel := context.WithCancel(context.Background())
t.Cleanup(cancel)

wantOverrides := []string{
wantOutput := []string{
"containeruser",
"FROM_CONTAINER_ENV=containerEnv",
"FROM_REMOTE_ENV=remoteEnv",
"CONTAINER_OVERRIDE_C=containerEnv",
Expand All @@ -1336,15 +1337,20 @@ RUN date --utc > /root/date.txt`, testImageAlpine),
ENV CONTAINER_OVERRIDE_C=container
ENV CONTAINER_OVERRIDE_CR=container
ENV CONTAINER_OVERRIDE_R=container
RUN adduser -D containeruser
RUN adduser -D remoteuser
USER root
`, testImageAlpine),
".devcontainer/devcontainer.json": `
{
"dockerFile": "Dockerfile",
"containerUser": "containeruser",
"containerEnv": {
"CONTAINER_OVERRIDE_C": "containerEnv",
"CONTAINER_OVERRIDE_CR": "containerEnv",
"FROM_CONTAINER_ENV": "containerEnv",
},
"remoteUser": "remoteuser",
"remoteEnv": {
"CONTAINER_OVERRIDE_CR": "remoteEnv",
"CONTAINER_OVERRIDE_R": "remoteEnv",
Expand Down Expand Up @@ -1429,7 +1435,7 @@ RUN date --utc > /root/date.txt`, testImageAlpine),
t.Fatalf("unexpected output (-want +got):\n%s", diff)
}

for _, want := range wantOverrides {
for _, want := range wantOutput {
assert.Contains(t, gotEnv, want, "expected env var %q to be present", want)
}
})
Expand Down
Loading