Skip to content

Commit 53c8fff

Browse files
authored
[gen-dockerfile] Make /code directory creation idempotent (#1956)
## Summary Resolves: - #1953 - #1930 ## How was it tested? * Note: I don't recommend applying the patch below used to test this PR. Building an actual Dockerfile is way more of an integration test and I feel it is out of scope. ```diff diff --git a/testscripts/generate/dockerfile.test.txt b/testscripts/generate/dockerfile.test.txt index d63680b..ec561564 100644 --- a/testscripts/generate/dockerfile.test.txt +++ b/testscripts/generate/dockerfile.test.txt @@ -1,3 +1,5 @@ exec devbox init exec devbox generate dockerfile exists Dockerfile +exec devbox add docker +exec devbox run -- docker build . ``` Followed by: ```shell $ go test ./testscripts -run TestScripts/dockerfile ``` which results in a successfully built dockerfile.
1 parent 9aac11a commit 53c8fff

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

internal/devbox/generate/tmpl/devcontainerDockerfile.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
WORKDIR /code
77
{{- if not .RootUser }}
88
USER root:root
9-
RUN mkdir /code && chown ${DEVBOX_USER}:${DEVBOX_USER} /code
9+
RUN mkdir -p /code && chown ${DEVBOX_USER}:${DEVBOX_USER} /code
1010
USER ${DEVBOX_USER}:${DEVBOX_USER}
1111
COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} devbox.json devbox.json
1212
COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} devbox.lock devbox.lock

0 commit comments

Comments
 (0)