Commit Graph
65 Commits
Author SHA1 Message Date
Mike Dougherty 2732cdf650 From docker/docker - Use multiple keyservers in install script
This improves on an earlier change by adding another keyserver and using a for loop instead of duplicating the command

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2017-06-16 11:53:39 -07:00
Frederick F. Kautz IV 3701606edc From docker/docker - Adding backup key server in install script
Signed-off-by: Frederick F. Kautz IV <fkautz@redhat.com>
2017-06-16 11:53:39 -07:00
Stefan Staudenmeyer ede637c47d From docker/docker - Use grep -qE instead of egrep which is deprecated.
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
2017-06-16 11:53:39 -07:00
Stefan Staudenmeyer 760cd763eb From docker/docker - Grep for installed AND held packages.
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
2017-06-16 11:53:39 -07:00
Mike Dougherty 2e5137bfab From docker/docker - Create a bundle for the install script to support other domains
For the CS Engine we need to have an install script like OSS does, but
the locations are all different, as is the GPG key used. This is
accomplished here by slightly altering the script itself and adding a
simple 'sed' based bundle for make.sh.

This install script is used in to change the URLs instead of sed in
release.sh.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2017-06-16 11:53:39 -07:00
Jessica Frazelle 451d82b228 From docker/docker - add warning if upgrading via script to migrate
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2017-06-16 11:53:39 -07:00
Sebastiaan van Stijn 92c1913e62 From docker/docker - Add -f flag to cURL install instructions
From the -f description:

(HTTP) Fail silently (no output at all) on server errors. This is mostly done
to better enable scripts etc to better deal with failed attempts. In normal
cases when an HTTP server fails to deliver a document, it returns an HTML
document stating so (which often also describes why and more). This flag will
prevent curl from outputting that and return error 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-16 11:53:39 -07:00
Jessica Frazelle 493940e247 From docker/docker - fix install script for ubuntu trusty
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2017-06-16 11:53:39 -07:00
Brian Torres-Gil 0d625b0f55 From docker/docker - Add support for installation on Kali Linux 2.0
Signed-off-by: Brian Torres-Gil <btorres-gil@paloaltonetworks.com>
2017-06-16 11:53:39 -07:00
Martin Kelly cf777ffc0d From docker/docker - 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>
2017-06-16 11:53:39 -07:00
Jessica Frazelle 3a9641bca7 From docker/docker - update debs/rpms for pkcs11 yubikey things
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2017-06-16 11:53:39 -07:00
Paolo G. Giarrusso 9476abea77 From docker/docker - Fix link to installation instructions
Fix #17872:

> The script at https://get.docker.com/ links to https://docs.docker.com/en/latest/installation/, which gives a 404 error. The correct link is https://docs.docker.com/engine/installation/.

Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com>
2017-06-16 11:53:39 -07:00
Dan Levy 046f800578 From docker/docker - Try me now, no linuxmint mentions needed
Signed-off-by: Dan Levy <dan@danlevy.net>
2017-06-16 11:53:39 -07:00
Flavio Castelli faca78d48d From docker/docker - Update SUSE/openSUSE installation script
Fix installation on SUSE Linux Enterprise machine, the updated Docker RPMs have
been moved to a different location.

Update both openSUSE and SUSE Linux Enterprise scripts to allow the
installation of experimental builds.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
2017-06-16 11:53:39 -07:00
Jessica Frazelle fada1dce3e From docker/docker - fix oracle linux install
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2017-06-16 11:53:39 -07:00
Ben Hall 8582b5a9ab From docker/docker - Fix install.sh to handle non-zero exit codes when checking lsb_release
Signed-off-by: Ben Hall <ben@benhall.me.uk>
2017-06-16 11:53:39 -07:00
Filipe Oliveira add23fd6f3 From docker/docker - Adding support to forked distributions in installer script.
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br>
2017-06-16 11:53:39 -07:00
Jessica Frazelle b79e994645 From docker/docker - fix regression
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2017-06-16 11:53:39 -07:00
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