Commit Graph
83 Commits
Author SHA1 Message Date
Justin Cormack e81e8dfebb From docker/docker - Do not use keyservers to fetch GPG keys for apt
The keyserver infrastructure is unreliable, and just adds another point
of failure without adding any security. Instead, commit the key used at
build time for ZFS to the repo, and inline our signing key into the
install script rather than just its fingerprint.

fix #28510
fix #13555

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-16 11:53:39 -07:00
Sebastiaan van Stijn 88b2df8207 From docker/docker - remove unsupported distros from install script
The install script currently includes some
distros that we don't actually have packages
for.

For these distros, the script currently
performs step to install Docker from
the distro's repository.

This patch removes those distros from
the install script, because we have no
control over these packages, and cannot
provide support for them.

Installing docker anyway will give the
false impression that they installed
a package from our repository (but they
didn't), and that they need to contact
us for support.

It's better to tell people that we don't
install in that case, and refer them to
the installation documentation, or the
documentation of their distro.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-16 11:53:39 -07:00
Christopher Jones aa60663a94 From docker/docker - Fix install script for multiarch
The current check for uname -m just looks for *64 which hits a lot
more cases than it should (mips for ex), and ignores a few that it shouldn't.

This check will run the install script if on a supported architecture
(x86_64 or amd64) or an unofficial one with a docker repository
(armv6l or armv7l) and will give a more accurate error on an unofficial
64-bit architecture that isn't in the docker repository.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-06-16 11:53:39 -07:00
Liz Zhang 7c4d89878c From docker/docker - Use the mirror in China for Azure China environment
Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Use the mirror in China for Azure China environment

Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Update option name to --mirror

Signed-off-by: Liz Zhang <lizzha@microsoft.com>

Update indent and change variable name

Signed-off-by: Liz Zhang <lizzha@microsoft.com>
2017-06-16 11:53:39 -07:00
Tibor Vass f85ee8bfe1 From docker/docker - install: fix debian stretch
Apparently, Debian stretch does not come with gpg installed by
default. This patch ensures that gpg is installed.

Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-16 11:53:39 -07:00
Bilal Amarni 4ff4ccc823 From docker/docker - Remove systemd drop-in file on raspbian
It makes systemd integration less intrusive, notably needed for
docker machine (cf. https://github.com/docker/machine/pull/3605).

The default storage driver would now be devicemapper, until the
deb package is updated.

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2017-06-16 11:53:39 -07:00
Fabio Rapposelli 4440a7f346 From docker/docker - Add rpm builder for VMware Photon OS
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2017-06-16 11:53:39 -07:00
Nick DeCoursin 97df431e43 From docker/docker - Update apparmor error message
Signed-off-by: decoursin <n.decoursin@foodpanda.com>
2017-06-16 11:53:39 -07:00
Dieter Reuter 685f4e4450 From docker/docker - Improve systemd config for Raspbian
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2017-06-16 11:53:39 -07:00
Dieter Reuter db27182ba4 From docker/docker - Fix typo in comment
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2017-06-16 11:53:39 -07:00
Dieter Reuter c851c982df From docker/docker - Add a Raspbian specific systemd unit file, use overlay by default
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2017-06-16 11:53:39 -07:00
Dieter Reuter a60650b9e1 From docker/docker - Add support to install Docker on raspbian/jessie
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2017-06-16 11:53:39 -07:00
Adam Kunk e11dc8dc31 From docker/docker - updates to fix install script for RHEL
fixing install script for rhel7

fixing install script for rhel7

Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org>

updates to fix install script for RHEL

fixing install script for rhel7

fixing install script for rhel7

Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org>
2017-06-16 11:53:39 -07:00
Sebastiaan van Stijn 21d8edb268 From docker/docker - Fix installation script for RHEL
the previous fix changed the lsb_dist variable
too early. We only normalize to "centos"
for the repository-location, so changing
it just before that.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-16 11:53:39 -07:00
Ken Cochrane f09147a6b3 From docker/docker - Fixed issue #23787 install script not working for RHEL7 host
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2017-06-16 11:53:39 -07:00
Dimitris Rozakis 5427827fa8 From docker/docker - Escape brackets in hack/install.sh
Fixes #23260

Signed-off-by: Dimitris Rozakis <dimrozakis@gmail.com>
2017-06-16 11:53:39 -07:00
Ken Cochrane e56373993e From docker/docker - Fix issues with get.docker.com install script with redhat fixes #23101
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2017-06-16 11:53:39 -07:00
Tibor Vass a25b9721d0 From docker/docker - Fix release scripts
Add some missing dependencies in the Dockerfile:
- apt-utils for apt-ftparchive.conf
- bsdmainutils for our use of the column command in
  hack/make/generate-index-listing

We also ensure that the docker daemon is started before calling
release-deb or release-rpm, since .detect-daemon-osarch, which is sourced
in each of them, requires the daemon to be running.

This commit also gets completely rid of s3cmd and fixes references to
AWS_* environment variables (changing from AWS_ACCESS_KEY to
AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to AWS_SECRET_ACCESS_KEY) in order
to please awscli. Also AWS_DEFAULT_REGION is now important to specify,
the default has been set to the region used by get.docker.com and
test.docker.com.

Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-16 11:53:39 -07:00
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