4 Commits

Author	SHA1	Message	Date
Sebastiaan van Stijn	36a670da43	Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2 ... fix #11094 - Allow 'docker import' to load from local files Upstream-commit: 67f9bbcbd4d741e22e61b21a411cd904dcd4329c Component: engine	2015-06-20 12:17:58 -07:00
Gildas Cuisinier	8b52aa6697	work on #11094 allow import from local file ... Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net> Upstream-commit: 3f64b76d4c66127466ce5b2ee0e8827eea7440b3 Component: engine	2015-06-20 09:04:43 +02:00
Mary Anthony	c6caf278a1	Fixing seds, deleting old stuff ... Signed-off-by: Mary Anthony <mary@docker.com> Upding sed, adding script to avoid redirects, remove mkdos Signed-off-by: Mary Anthony <mary@docker.com> Ignoring graphics with sed Signed-off-by: Mary Anthony <mary@docker.com> Fixing kitematic image Signed-off-by: Mary Anthony <mary@docker.com> Removing draft Signed-off-by: Mary Anthony <mary@docker.com> Fixing link Signed-off-by: Mary Anthony <mary@docker.com> removing from the menu Signed-off-by: Mary Anthony <mary@docker.com> Updatiing order of project material Signed-off-by: Mary Anthony <mary@docker.com> Removing from Regsitry v2 content per Olivier Signed-off-by: Mary Anthony <mary@docker.com> tweaking the touchup Signed-off-by: Mary Anthony <mary@docker.com> Removing include; only used four places; hugo global var replace Signed-off-by: Mary Anthony <mary@docker.com> Entering fixes from page-by-page Signed-off-by: Mary Anthony <mary@docker.com> Upstream-commit: 328dbd0aa2a5aca656b45c4148cb09f715fbe677 Component: engine	2015-06-17 21:05:37 -07:00
Mary Anthony	9a276424db	retooling for hugo ... Tweaking for Hugo Updating the Dockerfile with new sed; fix broken link on Kitematic Fixing image pull for Dockerfile Removing docs targets Signed-off-by: Mary Anthony <mary@docker.com> Upstream-commit: f93fee5f48cc92df8668380e4edc2b7bbd6c62c6 Component: engine	2015-06-15 13:19:38 -07:00