Skip to content
Merged
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
4 changes: 3 additions & 1 deletion 19.03-rc/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM alpine:3.10

RUN apk add --no-cache \
ca-certificates
ca-certificates \
# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014
openssh-client

# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses)
# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149
Expand Down
4 changes: 1 addition & 3 deletions 19.03-rc/git/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
FROM docker:19.03-rc

RUN apk add --no-cache \
git \
openssh-client
RUN apk add --no-cache git
4 changes: 3 additions & 1 deletion 19.03/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM alpine:3.10

RUN apk add --no-cache \
ca-certificates
ca-certificates \
# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014
openssh-client

# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses)
# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149
Expand Down
4 changes: 1 addition & 3 deletions 19.03/git/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
FROM docker:19.03

RUN apk add --no-cache \
git \
openssh-client
RUN apk add --no-cache git
4 changes: 1 addition & 3 deletions Dockerfile-git.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
FROM docker:%%VERSION%%

RUN apk add --no-cache \
git \
openssh-client
RUN apk add --no-cache git
4 changes: 3 additions & 1 deletion Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM alpine:%%TAG%%

RUN apk add --no-cache \
ca-certificates
ca-certificates \
# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014
openssh-client

# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses)
# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149
Expand Down