Commit Graph

15 Commits

Author SHA1 Message Date
18fcb12c86 install.sh: fix for multiarch deb/ubuntu
Currently, the Docker repos will trigger apt-get errors on a
multiarch-configured deb system because the repos don't contain all
architectures. For example, on a multiarch system supporting amd64 and
armhf, apt-get will look for armhf Docker packages, fail to find them,
and error out.

Fix this by qualifying the repo line with the currently active
architecture.

This fixes issue #18207.

Signed-off-by: Martin Kelly <martin@surround.io>
Upstream-commit: 3e5ac742417dc9461dd090c29ee9971ff0974adb
Component: engine
2015-11-24 16:53:13 -08:00
3f9a89737d Fixed broken links, and updated some to https
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: ad179e0e957a58181d71838eb0c2c7c019b4b2fb
Component: engine
2015-11-24 10:39:02 -05:00
6df421c14f Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 043f447e2e9ecb9d6f34bcee6c11f20f263baf66
Component: engine
2015-11-23 11:19:38 +10:00
fb0212db59 Merge pull request #17861 from gissehel/apt-source-doc
explicit way to express that docker.list are different choices and not just one big file
Upstream-commit: 20905ec452ef0139027c6b0e193dda0d83a59f69
Component: engine
2015-11-20 10:06:13 +01:00
20dbe8b748 Remove redundent lines
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org>
Upstream-commit: 741246d69f7708941ee86a706c6e93d20275904f
Component: engine
2015-11-17 18:24:17 +01:00
a03e5da6fb Use the SKS port 80 keyserver pool, as it is more reliable than the MIT server
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
Upstream-commit: 4fca870212ea11010e9dc5ecc802d076dcc1c683
Component: engine
2015-11-10 20:44:18 +00:00
e9df3b10ae explicit way to express that those are different choice and not just one big file to create
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org>
Upstream-commit: e036bf6c0742ef4f3c7caab3ad6960fc27977a1d
Component: engine
2015-11-10 11:41:19 +01:00
6b6c7cc2b6 Enabled GitHub Flavored Markdown
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8fee1c2020186ac100b45e64864b94ae3a169ad5
Component: engine
2015-10-11 07:49:54 -07:00
1aa805ef60 Updating the installations with rpm and yum install
Prefer rpm/yum over script install
Updating with review comments
Adding second round review comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 5e061b5945df047c68953aa424fafbc5a2706ab5
Component: engine
2015-10-04 11:29:58 -07:00
3709a03001 Make official install instructions use curl instead of wget
YOU GO CURL

Fixes #14650

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: c76fef1791106ca60b7f913a895a77251b695c0a
Component: engine
2015-08-07 10:16:09 -07:00
153ab403d4 Add link to Systemd article, fix typo
Signed-off-by: Chander G <chandergovind@gmail.com>
Upstream-commit: b9e6be25d1afbf04a3455ff55394bd9037238b2c
Component: engine
2015-07-29 01:54:44 +05:30
a56deec7d3 Fix minor typo in Debian installation docs
Signed-off-by: Chander G <chandergovind@gmail.com>
Upstream-commit: ceeb22dc6e341da413926a5f972d54f5a3ca8715
Component: engine
2015-07-26 03:49:18 +05:30
56865b2a68 update docs for new install script
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 877d740d4837c67030458254db80aea3869989b1
Component: engine
2015-07-22 15:08:14 -07:00
9b385c8c95 Fixing Wheezy link
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com>
Upstream-commit: 82b444e3fa18af2a392f0896a12ef929b08320b0
Component: engine
2015-07-01 13:01:00 +09:00
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