Skip to content

Commit 7a67842

Browse files
committed
Add "openssh-client" to the standard client images
This adds ~6MB (which is nothing compared to the Docker artifacts), and since 19.03.x gives us support for `DOCKER_HOST=ssh://...`
1 parent ffff699 commit 7a67842

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

19.03-rc/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM alpine:3.10
22

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

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

19.03-rc/git/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
FROM docker:19.03-rc
22

3-
RUN apk add --no-cache \
4-
git \
5-
openssh-client
3+
RUN apk add --no-cache git

19.03/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM alpine:3.10
22

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

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

19.03/git/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
FROM docker:19.03
22

3-
RUN apk add --no-cache \
4-
git \
5-
openssh-client
3+
RUN apk add --no-cache git

Dockerfile-git.template

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
FROM docker:%%VERSION%%
22

3-
RUN apk add --no-cache \
4-
git \
5-
openssh-client
3+
RUN apk add --no-cache git

Dockerfile.template

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM alpine:%%TAG%%
22

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

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

0 commit comments

Comments
 (0)