Commit Graph
47 Commits
Author SHA1 Message Date
Avi Miller debc01ac3f From docker/docker - Fix for #14924. Seperates lsb_dist detection from dist_version detection
so that the latter can be distro specific.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
2017-06-16 11:53:39 -07:00
Antonio Murdaca 2c3a9d4ab6 From docker/docker - Fix install script to handle debian 8.1 apt repo string
Fix #14911

Signed-off-by: Antonio Murdaca <runcom@linux.com>
2017-06-16 11:53:39 -07:00
Jessica Frazelle fbad303638 From docker/docker - sh -c the cat repo for yum
Signed-off-by: Jessica Frazelle <princess@docker.com>
2017-06-16 11:53:39 -07:00
Avi Miller e19116bf06 From docker/docker - Fix typo.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2017-06-16 11:53:39 -07:00
Avi Miller e574f678ac From docker/docker - Switch to using only the RPM command to determine the distro version.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2017-06-16 11:53:39 -07:00
evalle 18ecac1598 From docker/docker - Fixing SLES12 issue
Signed-off-by: evalle <shmarnev@gmail.com>
2017-06-16 11:53:39 -07:00
Jessica Frazelle 98d433c231 From docker/docker - fix fedora release
Signed-off-by: Jessica Frazelle <princess@docker.com>
2017-06-16 11:53:39 -07:00
Jessica Frazelle 92a6335919 From docker/docker - update install script for new repos
Signed-off-by: Jessica Frazelle <princess@docker.com>
2017-06-16 11:53:39 -07:00
evalle ec4a8ad92c From docker/docker - Fix issue with detection logic of Centos in install.sh
Signed-off-by: evalle <shmarnev@gmail.com>
2017-06-16 11:53:39 -07:00
Penghan Wang 7210eca0c9 From docker/docker - Fix failure on adding source list for ubuntu
For hybrid cloud, some ubuntu vm images doesn't have the directory
`/etc/apt/sources.list.d` which cause failure on creating
`/etc/apt/sources.list.d/docker.list`.

To fix this issue, create this directory first (if it doesn't exist).

Signed-off-by: Penghan Wang <ph.wang@daocloud.io>
2017-06-16 11:53:39 -07:00
Thomas Sjögren 1684eb1c66 From docker/docker - remove bashism
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-06-16 11:53:39 -07:00
Thomas Sjögren e2db34ba28 From docker/docker - mention the daily experimental build
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-06-16 11:53:39 -07:00
Jessica Frazelle 14409cdef2 From docker/docker - add gpg fingerprint for experimental
Signed-off-by: Jessica Frazelle <princess@docker.com>
2017-06-16 11:53:39 -07:00
Flavio Castelli 5202095fa1 From docker/docker - Added openSUSE and SUSE Linux Enterprise support to install.sh
Handle docker installation on openSUSE and SUSE Linux Enterprise
via https://get.docker.io/

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
2017-06-16 11:53:39 -07:00
Tianon Gravi b78d739b66 From docker/docker - Update "install.sh" warning to be more verbose
See https://github.com/docker/docker/issues/12395#issuecomment-99941300 for some of the context on this one.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2017-06-16 11:53:39 -07:00
Andrew Martin 8b81608fc4 From docker/docker - Add kali to install script
https://www.kali.org/ is a Debian derivative. This script completes
succesfully using the Debian install path

Signed-off-by: Andrew Martin <sublimino@gmail.com>
2017-06-16 11:53:39 -07:00
Yahya 2682d815bf From docker/docker - adding elementary OS to install script
It's basically just an Ubuntu, I'm a total noob but I've tried it on elementary OS "Freya" and it worked

Signed-off-by: M Yahya <ya7yaz@gmail.com>
2017-06-16 11:53:39 -07:00
Tianon Gravi 43265378db From docker/docker - Commonalize more bits of install.sh (especially standardizing around "cat <<-EOF")
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2017-06-16 11:53:39 -07:00
Eric Windisch c7b7979e19 From docker/docker - Wrap installer in a function
This will assure that the install script will not
begin executing until after it has been downloaded should
it be utilized in a 'curl | bash' workflow.

Signed-off-by: Eric Windisch <eric@windisch.us>
2017-06-16 11:53:39 -07:00
Aaron Welch 9244f2b8f2 From docker/docker - add centos to supported distros
Signed-off-by: Aaron Welch <welch@packet.net>
2017-06-16 11:53:39 -07:00
Matt Bentley a01e79070d From docker/docker - Add 'extras' virtual package to fix kernel upgrade fallback from aufs to devicemapper
Added checks for the proper kernel support before blindly installing extras package

Fixes #10859

Signed-off-by: Matt Bentley <mbentley@mbentley.net>
2017-06-16 11:53:39 -07:00
Tianon Gravi 92373fbbf2 From docker/docker - Move scripts back to hack/, leave docs in project/
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2017-06-16 11:53:39 -07:00
Solomon Hykes 57fb7892e3 From docker/docker - Move 'hack' to the less confusing 'project'
We might want to break it up into smaller pieces (eg. tools in one
place, documents in another) but let's worry about that later.

Signed-off-by: Solomon Hykes <solomon@docker.com>
2017-06-16 11:53:39 -07:00
unclejack 4592e594a5 From docker/docker - contrib/install.sh: remove pull of hello-world
This removes the pull of the hello-world image from install.sh to
address privacy concerns.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2017-06-16 11:53:39 -07:00
Jessica Frazelle 7d6864c438 From docker/docker - check ID in os-release instead
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2017-06-16 11:53:39 -07:00
Amit Bakshi 0191e51926 From docker/docker - install.sh: Fix for Amazon's Linux AMI
Use /etc/os-release to determine distro

Contents of /etc/os-release on Amazon Linux AMI 2014.09:
NAME="Amazon Linux AMI"
VERSION="2014.09"
ID="amzn"
ID_LIKE="rhel fedora"
VERSION_ID="2014.09"
PRETTY_NAME="Amazon Linux AMI 2014.09"
ANSI_COLOR="0;33"
CPE_NAME="cpe:/o:amazon:linux:2014.09:ga"
HOME_URL="http://aws.amazon.com/amazon-linux-ami/"

Signed-off-by: Amit Bakshi <ambakshi@gmail.com>
Signed-off-by: Jessica Frazelle <jess@docker.com>
2017-06-16 11:53:39 -07:00
Tibor Vass 2bcc64247c From docker/docker - change docs.docker.io to docs.docker.com in install script
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2017-06-16 11:53:39 -07:00
Jérôme Petazzoni fd9ed0705b From docker/docker - Add -E flag to sudo (fixes #8494)
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
2017-06-16 11:53:39 -07:00
Tibor Vass 74ac14753c From docker/docker - Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2017-06-16 11:53:39 -07:00
Bruno Binet a4f860cf32 From docker/docker - Automatically clean up hello-world container with --rm
Signed-off-by: Bruno Binet <bruno.binet@gmail.com>
2017-06-16 11:53:39 -07:00
Tianon Gravi 300d8acbd7 From docker/docker - Add "hack/install.sh" to the "PRs welcome" note in the end of the install script
Also, simplified the output method by using `cat >&2 <<EOF ...` instead of multiple lines of `echo >&2 '...'`.

Signed-off-by: Andrew Page <admwiggin@gmail.com>
2017-06-16 11:53:39 -07:00
unclejack 6a09d4a770 From docker/docker - hack/install.sh: install apparmor when enabled
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2017-06-16 11:53:39 -07:00
Tomasz Lipinski 3ac5775a0e From docker/docker - Allows installation on Linux Mint Debian Edition
Otherwise platform won't be detected

Signed-off-by: Tomasz Lipinski <me@tlipinski.net>
2017-06-16 11:53:39 -07:00
Sven Dowideit d031c3c8c2 From docker/docker - Tianon made a micro-image (sub one meg?) that we can use as a very fast to download 'yes, your docker can download and run an image' test
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2017-06-16 11:53:39 -07:00
Tianon Gravi 6fe43ce8d3 From docker/docker - Standardize "curl" arguments across the repo to be or include "-sSL"
- https://botbot.me/freenode/docker-dev/msg/17315692/
- https://botbot.me/freenode/docker-dev/msg/17315994/

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2017-06-16 11:53:39 -07:00
James Turnbull 8146f363f0 From docker/docker - Removed extra whitespace
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2017-06-16 11:53:39 -07:00
James Turnbull fed4784984 From docker/docker - Added Fedora installation method
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2017-06-16 11:53:39 -07:00
Paul Annesley 047ff28486 From docker/docker - install.sh (get.docker.io) aufs comment updated.
devicemapper has landed, but the TODO hasn't been actioned presumably
because aufs is still preferred over devicemapper when available[1].

Comment updated accordingly.

Citation [1]: https://github.com/crosbymichael/docker/blob/267ca39921c35826ccbdb84fbbc0690bfef385d7/runtime/graphdriver/driver.go#L40-L46

Docker-DCO-1.1-Signed-off-by: Paul Annesley <paul@annesley.cc> (github: pda)
2017-06-16 11:53:39 -07:00
Viktor Vojnovski f5bff6739c From docker/docker - refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740
In #4740, the apt-key call in docs is changed to use the keyserver port 80 instead of
port 11371, as the previous call would fail with a restrictive firewall or proxy.
This commit extends the change to all apt-key calls in the repository.

Docker-DCO-1.1-Signed-off-by: Viktor Vojnovski <vojnovski@gmail.com> (github: vojnovski)
2017-06-16 11:53:39 -07:00
Tianon Gravi 7bd0bc91cb From docker/docker - Make get.docker.io install directions slightly better by telling user exactly how to add themselves to the "docker" group
As a bonus, if the user has run this script the way we recommend (ie, without "sudo" or "su", run as their user), we can actually give them the exact command they'll need with their correct username substituted appropriately.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2017-06-16 11:53:39 -07:00
Tianon Gravi b9e5728bbb From docker/docker - Inline the test.docker.io fingerprint in the install.sh script as well
As long as we're doing it, we ought to do it for all the "official" Docker properties at least

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2017-06-16 11:53:08 -07:00
zimbatm d083c8fc6d From docker/docker - Fixes key installation for other target urls in hack/install.sh
Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com> (github: zimbatm)
2017-06-16 11:53:08 -07:00
zimbatm 7358226c1e From docker/docker - Makes sure the GPG key fingerprint is inlined in the doc everywhere.
Instead of `curl $url | apt-get add -` use the ubuntu keyserver and a full
fingerprint to retreive the key. This makes the distribution of the GPG key
more secure an less likely to change even if 3rd party gains access to the
packages repository.

Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com> (github: zimbatm)
2017-06-16 11:53:08 -07:00
Tianon Gravi 743a791296 From docker/docker - Fix install failure when busybox can't be downloaded
Whether or not the "busybox" image downloads and runs properly at the end of the build, we don't want to have the script return a failing exit code, especially since at that point, Docker is successfully installed, and we're just tooting our own horn for good measure.
2017-06-16 11:53:08 -07:00
Tianon Gravi 360a40ab6e From docker/docker - Fix install.sh with $sh_c to get sudo/su for modprobe 2017-06-16 11:53:08 -07:00
Tianon Gravi aeff05d879 From docker/docker - Update hack/install.sh with some more Ubuntu-specific installation stuff while we're still on AUFS (installing linux-image-extra-$(uname -r) when we can't find AUFS to try to find AUFS) 2017-06-16 11:53:07 -07:00
Tianon Gravi 4f9bbcf2f4 From docker/docker - Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.), thus making it an official script and moving it to hack/ 2017-06-16 11:53:07 -07:00