Commit Graph

73 Commits

Author SHA1 Message Date
5d6747bf0a 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>
Upstream-commit: adac575dd33c48b19539c0f0660c5c3f344c7b75
Component: engine
2016-02-26 17:22:00 -08:00
0944ceb1d1 Adding backup key server in install script
Signed-off-by: Frederick F. Kautz IV <fkautz@redhat.com>
Upstream-commit: 5e0b8b99d115bc6b12d930e80aca69fecc7dda78
Component: engine
2016-02-09 23:26:45 -08:00
18d20ed26a Use grep -qE instead of egrep which is deprecated.
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
Upstream-commit: b3d66ff010268e1f63f5555508833dcf3604f0b6
Component: engine
2016-02-05 18:55:39 +01:00
2a6ce914c6 Grep for installed AND held packages.
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
Upstream-commit: 996ca75413f4072c03cca9229dc5901bd690c4f8
Component: engine
2016-02-05 17:41:57 +01:00
fba580f28b Merge pull request #19146 from mikedougherty/cs-105-download-script
Create a bundle for the install script to support other domains
Upstream-commit: 21ec6d3789b93aad5788785cf4be4a2445044375
Component: engine
2016-01-22 09:25:24 -08:00
d0c4b1bf31 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>
Upstream-commit: 51dad1185a8dcf55f2e3473b79748e0e72c6590c
Component: engine
2016-01-21 20:42:20 -08:00
16c01aa282 add warning if upgrading via script to migrate
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 60d44d8b80dd693f5163f54293e6857b4fb3bb6a
Component: engine
2016-01-19 15:41:08 -08:00
0cad98a56c 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>
Upstream-commit: 9cf29be0ee0b19c25471c19c224f9af150beaf1e
Component: engine
2016-01-06 16:05:16 +01:00
17c0082e32 Merge pull request #18648 from jfrazelle/fix-install-script-trusty
fix install script for ubuntu trusty
Upstream-commit: b0f652fc3892ed85673c79587807a8b9cb6256a4
Component: engine
2015-12-15 12:55:01 -08:00
26cf52e1eb Merge pull request #18097 from btorresgil/kali-linux-2.0-installer
Add support for installation on Kali Linux 2.0
Upstream-commit: 42ea7a8a93c15e77904e4324b77aa86cc0cab29d
Component: engine
2015-12-15 08:52:53 -08:00
3d2a8bfdec fix install script for ubuntu trusty
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: bdde4b32a1bd1b2c79ac22464ffb78509046fcb4
Component: engine
2015-12-14 13:13:39 -08:00
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
9ee83ab63e Add support for installation on Kali Linux 2.0
Signed-off-by: Brian Torres-Gil <btorres-gil@paloaltonetworks.com>
Upstream-commit: 9c1ccf708497c1c2009561090b60f150d1b1876b
Component: engine
2015-11-19 11:18:28 -08:00
08e6893ada update debs/rpms for pkcs11 yubikey things
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: cf4c3da725e5c923b637a0dbea3d20064286f008
Component: engine
2015-11-13 13:20:53 -08:00
542df63133 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>
Upstream-commit: c5f24c7902df5a48258056e799952200f250c5f2
Component: engine
2015-11-10 18:06:58 +01:00
103e2de74a Merge pull request #16533 from justsml/LMDEv2
LMDE check added to `check_forked()` function - See #16498
Upstream-commit: ea59233eb1fda209d48e11bab10f4cfd2ffe9914
Component: engine
2015-11-08 02:28:11 -08:00
7ca814e803 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>
Upstream-commit: 400ac8a66cf3c40f162153dcecd44b4fa8e3453f
Component: engine
2015-10-14 20:55:28 +02:00
f1d2880874 Try me now, no linuxmint mentions needed
Signed-off-by: Dan Levy <dan@danlevy.net>
Upstream-commit: 9728269424461696cf2223ebb723828041da1f61
Component: engine
2015-09-25 19:07:59 -06:00
313dca405d fix oracle linux install
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0eade329dc1b75424dfc71a110d1848498b3d153
Component: engine
2015-08-11 16:33:14 -07:00
724e66acf4 Fix install.sh to handle non-zero exit codes when checking lsb_release
Signed-off-by: Ben Hall <ben@benhall.me.uk>
Upstream-commit: 3b28bada0af08993508af8658d56c15b17ec6fb7
Component: engine
2015-08-08 11:44:52 +01:00
57bb897892 Adding support to forked distributions in installer script.
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br>
Upstream-commit: f618de15436941c91cc1b82a56518a4e338c7b76
Component: engine
2015-08-04 21:33:48 -03:00
d1ebdf9030 fix regression
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b0af811272c7cf9d7694ab5a21ded776a46a7d7a
Component: engine
2015-07-30 16:38:51 -07:00
c53f933e8d 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>
Upstream-commit: 5c6446f335a9f9010cabe93104f6feced0166dd8
Component: engine
2015-07-30 07:30:51 +10:00
61d8e3e275 Merge pull request #15015 from runcom/14911-fix-install-script-debian81
Fix install script to handle debian 8.1 apt repo string
Upstream-commit: 1cfae07a6e04cc0158142afa37a1a758f83aeecb
Component: engine
2015-07-29 10:45:50 -07:00
5876286f87 sh -c the cat repo for yum
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 93d134c61f90a366065b28c2b48021361c00cd76
Component: engine
2015-07-28 20:25:26 -07:00
dfaa764a09 Fix install script to handle debian 8.1 apt repo string
Fix #14911

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 98f15cae89ab528d60d8df8b22da2747cc9e67bc
Component: engine
2015-07-27 20:21:29 +02:00
219631f054 Fix typo.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 59e48b346848a131d85a808fa1e21aea8c4f9833
Component: engine
2015-07-24 08:14:06 +10:00
89bac51dfe Switch to using only the RPM command to determine the distro version.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: a43199f14314b3d966e5723cd336f9747a0f1ca0
Component: engine
2015-07-24 07:38:28 +10:00
70222bd2d9 Merge pull request #14893 from Evalle/14653-fix-sles-issue
Fixing SLES12 issue
Upstream-commit: d44e334a6eab31edf2700bf2ca2246b3cfe976a8
Component: engine
2015-07-23 18:22:38 +02:00
b8bceb1145 fix fedora release
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 8192a9ac6cc5b1e010b20185ccef6aecfed7c405
Component: engine
2015-07-23 09:16:35 -07:00
ab56e0ae0e Fixing SLES12 issue
Signed-off-by: evalle <shmarnev@gmail.com>
Upstream-commit: 94119c58a103ef59262052b11b414b8a51299da6
Component: engine
2015-07-23 08:59:23 +02:00
54ba2b1bf3 update install script for new repos
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 451d3f5950b493029000c2554fe3f266ffb007e4
Component: engine
2015-07-22 15:08:19 -07:00
d231ef5cce Merge pull request #14556 from Evalle/14497-fix-install-script
Fix issue with detection logic of Centos in install.sh
Upstream-commit: 655b1d23678f67857a1d39606eebb86799f65f06
Component: engine
2015-07-13 13:47:08 -07:00
7af622bdcb Fix issue with detection logic of Centos in install.sh
Signed-off-by: evalle <shmarnev@gmail.com>
Upstream-commit: 33039aa12939f6be6d8775ca5d9bee7541641053
Component: engine
2015-07-13 20:50:31 +02:00
6ee85e4248 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>
Upstream-commit: 80e90499aafabb27c68a2ddca31339aa125c40ae
Component: engine
2015-07-11 22:37:02 +08:00
9237f415e8 remove bashism
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Upstream-commit: 9b42de0e574a9f50af40e40dd52c5437151375c3
Component: engine
2015-07-01 22:19:24 +02:00
09fcb93d66 mention the daily experimental build
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Upstream-commit: 21ec389fe1c71cc44f93657e5afb84d9042e8f0c
Component: engine
2015-07-01 22:12:57 +02:00
4c3630993e add gpg fingerprint for experimental
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 957622d452983f14bcc79443c9ff05780e1fd6bf
Component: engine
2015-06-15 18:49:22 -07:00
c66e3961be 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>
Upstream-commit: d0c4c7c83f4882dc704a8089029a012e9b1a9a36
Component: engine
2015-06-03 21:56:27 +02:00
0dfa2f6043 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>
Upstream-commit: fc9ff248c1ccb586297419336b6ad5da640f2bd5
Component: engine
2015-05-07 14:20:40 -06:00
a1213158fa 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>
Upstream-commit: 2dd88af79b0e1af6df0551b993cd9fffbd5881ee
Component: engine
2015-04-22 14:56:00 +01:00
776b585b81 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>
Upstream-commit: b57830aee4abc86155d401b6d8a0215c3a4b5a1b
Component: engine
2015-04-17 02:02:22 +02:00
cb92c33b81 Commonalize more bits of install.sh (especially standardizing around "cat <<-EOF")
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 6842bba163de753a5ff3ddbaf9b408c89235022b
Component: engine
2015-04-09 19:28:25 -06:00
238dec85fd 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>
Upstream-commit: fa961ce0463ebd738da875c3a6da8171373d7723
Component: engine
2015-04-09 14:26:07 -04:00
45edbec150 add centos to supported distros
Signed-off-by: Aaron Welch <welch@packet.net>
Upstream-commit: a6b8f2e3fe4bdc0db8b526bff8b91bb1bd3a7bde
Component: engine
2015-04-03 08:56:26 -04:00
1e686c8b8b 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>
Upstream-commit: b89d04dd62e1a779f449804772c5bc5b64af65e8
Component: engine
2015-03-16 07:46:18 -04:00
719f00fbf2 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>
Upstream-commit: 949a21b55f3b8d7d1ae7a7b9829111a8f0dbf7e2
Component: engine
2015-03-13 14:04:08 -06:00
e8e8b5b2cb 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>
Upstream-commit: 32e61b8f5c3f855f5e204064be1aea6a877dda43
Component: engine
2014-11-09 21:50:28 +00:00
94faaa2f15 Merge pull request #8700 from unclejack/install_no_pull
contrib/install.sh: remove pull of hello-world
Upstream-commit: c6cf978b4ba8f246094001be8f8d8d6a4319f697
Component: engine
2014-11-04 10:28:43 -07:00
53dcf06a52 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)
Upstream-commit: f9d80712d9417feadd63cb71c0c7825c4e9f9fd4
Component: engine
2014-11-04 19:05:47 +02:00