Skip to content

Conversation

@yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/docker@5664931: Merge pull request docker-library/docker#207 from infosiftr/ssh
- docker-library/docker@7a67842: Add "openssh-client" to the standard client images
@yosifkit
Copy link
Member Author

Diff:
diff --git a/docker_git/Dockerfile b/docker_git/Dockerfile
index 824ce8c..2c8edb9 100644
--- a/docker_git/Dockerfile
+++ b/docker_git/Dockerfile
@@ -1,5 +1,3 @@
 FROM docker:19.03
 
-RUN apk add --no-cache \
-		git \
-		openssh-client
+RUN apk add --no-cache git
diff --git a/docker_latest/Dockerfile b/docker_latest/Dockerfile
index 7b2a4ae..065d04a 100644
--- a/docker_latest/Dockerfile
+++ b/docker_latest/Dockerfile
@@ -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

@yosifkit
Copy link
Member Author

Build test of #7110; 6a89cad; amd64 (docker):

$ bashbrew build docker:19.03.5
Building bashbrew/cache:a519f3f2d7caa8cb7ffc7945031448f00d27fc123a99034410425a8e0cbcdb5d (docker:19.03.5)
Tagging docker:19.03.5
Tagging docker:19.03
Tagging docker:19
Tagging docker:stable
Tagging docker:test
Tagging docker:latest

$ test/run.sh docker:19.03.5
testing docker:19.03.5
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build docker:19.03.5-dind
Building bashbrew/cache:7497c45516ca78f4285b8595bbd8deef2d3799797565624193812721073b65ee (docker:19.03.5-dind)
Tagging docker:19.03.5-dind
Tagging docker:19.03-dind
Tagging docker:19-dind
Tagging docker:stable-dind
Tagging docker:test-dind
Tagging docker:dind

$ test/run.sh docker:19.03.5-dind
testing docker:19.03.5-dind
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'docker-dind' [5/6]....passed
	'docker-registry-push-pull' [6/6]....passed


$ bashbrew build docker:19.03.5-dind-rootless
Building bashbrew/cache:ae67d06ca42cce333fa5350e171b37b169057b8a88383b798dcd8bd912f0e90c (docker:19.03.5-dind-rootless)
Tagging docker:19.03.5-dind-rootless
Tagging docker:19.03-dind-rootless
Tagging docker:19-dind-rootless
Tagging docker:stable-dind-rootless
Tagging docker:test-dind-rootless
Tagging docker:dind-rootless

$ test/run.sh docker:19.03.5-dind-rootless
testing docker:19.03.5-dind-rootless
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build docker:19.03.5-git
Building bashbrew/cache:0d6b055bc8924ab0b680edd67d63fe495ea45fa71181acf8b3b6c68da6b09c28 (docker:19.03.5-git)
Tagging docker:19.03.5-git
Tagging docker:19.03-git
Tagging docker:19-git
Tagging docker:stable-git
Tagging docker:test-git
Tagging docker:git

$ test/run.sh docker:19.03.5-git
testing docker:19.03.5-git
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit b204949 into docker-library:master Dec 11, 2019
@yosifkit yosifkit deleted the docker branch December 11, 2019 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants