Skip to content

[RFC] dind: include git to support build from remote source #295

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions 20.10/dind/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions 20.10/git/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Dockerfile-dind.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
FROM docker:{{ env.version }}

{{ if ["19.03", "19.03-rc", "20.10-rc"] | index(env.version) | not then ( -}}
# git is installed in a separate layer to allow sharing between the "dind" and "git" variants
RUN apk add --no-cache git
{{ ) else "" end -}}
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN set -eux; \
apk add --no-cache \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile-git.template
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
FROM docker:{{ env.version }}

{{ if ["19.03", "19.03-rc", "20.10-rc"] | index(env.version) | not then ( -}}
# git is installed in a separate layer to allow sharing between the "dind" and "git" variants
{{ ) else "" end -}}
RUN apk add --no-cache git