Commit Graph
118 Commits
Author SHA1 Message Date
Lars Noldan 80bb5df2ef removed fast operator from makecache which is no longer supported in F26 2017-07-18 15:16:26 -05:00
Eli Uriegas 583e954e69 Merge pull request #10 from seemethere/fix_old_get_docker_com_behavior
Simplify distribution checks, fix raspbian support
2017-07-14 10:24:09 -07:00
Eli Uriegas df8e71d0cc Simplify distribution checks, fix raspbian support
Moved distribution checks to a function that just checks
`/etc/os-release` (which also fixes raspbian installation in
environments that do not have the lsb_release command).

Also shuffles around some TODO messages.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-07-13 14:38:00 -07:00
Andrew Hsu 238b195650 Merge pull request #9 from andrewhsu/refactor-distro-check
cleanup in prep for refactor
2017-07-13 14:18:07 -07:00
Andrew Hsu 08feb536f3 SC2034 unused variable
yum_url appears unused. Verify it or export it.
https://github.com/koalaman/shellcheck/wiki/SC2034

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 02:54:06 +00:00
Andrew Hsu dda857ecfa SC2086 double quote
Double quote to prevent globbing and word splitting.
https://github.com/koalaman/shellcheck/wiki/SC2086

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 00:38:50 +00:00
Andrew Hsu 8950614208 SC2021 don't use [] around ranges in tr
Don't use [] around ranges in tr, it replaces literal square brackets.
https://github.com/koalaman/shellcheck/wiki/SC2021

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 00:37:13 +00:00
Andrew Hsu cffd6ad6a9 SC2002 useless cat
Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.
https://github.com/koalaman/shellcheck/wiki/SC2002

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 00:37:13 +00:00
Andrew Hsu b39937bd14 add shellcheck make target
Shell linter: https://github.com/koalaman/shellcheck

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 00:37:08 +00:00
Andrew Hsu cf6af1c0d6 Merge pull request #8 from andrewhsu/fix-service-start
removed starting of service for fedora and centos
2017-07-10 09:18:52 -07:00
Andrew Hsu 006a30aa83 execute verify-docker-install straight-up to use setopt
By executing `bash verify-docker-install`, the `bash -e` at the top of
the script is not honored. Should just execute the script straight-up
to use whatever `set` options are desired in the script.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-09 17:43:01 +00:00
Andrew Hsu 111989bb35 removed starting of service for fedora and centos
Running install.sh inside docker container, receiving error message:

  Failed to get D-Bus connection: Operation not permitted

Even though the rpm is successfully installed.

In rpm world, should not start systemd service after install of rpm
package if the service is not already started before install, which is
the case for first install of the package.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-09 17:11:43 +00:00
Eli Uriegas 13838e00b7 Merge pull request #6 from andrewhsu/readme
added more description about purpose of script
2017-07-06 09:57:45 -07:00
Andrew Hsu a5109e076a added more description about purpose of script
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-06 09:54:57 -07:00
Eli Uriegas d9b80e549f Merge pull request #4 from seemethere/add_open_source_documentation
Adds changes to opensource docker-install
2017-06-26 11:33:35 -07:00
Eli Uriegas ca15c7204a Adds changes to opensource docker-install
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-26 10:29:41 -07:00
Tibor Vass 625cd658f7 Merge pull request #5 from seemethere/remove_kernel_checks
Removes kernel checks
2017-06-22 11:59:00 -07:00
Eli Uriegas e9c549d88a Removes kernel checks
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-22 11:40:26 -07:00
Eli Uriegas f3368908ad Merge pull request #3 from seemethere/make_jenkinsfile_reflective
Make the jenkinsfile able to test both channels
2017-06-19 16:29:09 -07:00
Eli Uriegas b9bd4a50ff Make the jenkinsfile able to test both channels
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-19 16:06:04 -07:00
Eli Uriegas 86f3d56754 Merge pull request #2 from seemethere/make_test_channel_env_variable
Make test channel configurable by env variable
2017-06-19 15:55:53 -07:00
Eli Uriegas 32dae208ce Make test channel configurable by env variable
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-19 15:53:29 -07:00
Andrew Hsu 868abfe960 Merge pull request #1 from seemethere/add_1706_changes
Adds support for download.docker.com
2017-06-16 15:58:12 -07:00
Eli Uriegas 4dda1740e9 Add ways to test other channels
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-16 15:35:49 -07:00
Eli Uriegas 2f99a64478 Add gitignore for logs
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-16 13:44:41 -07:00
Eli Uriegas de9757bd6b Add testing infrastructure
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-16 13:44:32 -07:00
Eli Uriegas 87d90102ff Initial commit for 17.06 changes
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-16 13:34:05 -07:00
Steve Desmond 8b86f99c9e From docker/docker - make it clearer which packages to install for AUFS support
Signed-off-by: Steve Desmond <steve@vtsv.ca>
2017-06-16 11:53:39 -07:00
Tabakhase 67ca42d533 From docker/docker - Fix install.sh of get.docker.com for debian-sudo
repair sudo call on key-add for install / https://get.docker.com/

fix #32424

Signed-off-by: Tabakhase <github@tabakhase.com>
2017-06-16 11:53:39 -07:00
hyzhou.zhy 61ac0989b9 From docker/docker - Add Aliyun mirror support to hack/install.sh
Signed-off-by: hyzhou.zhy <hyzhou.zhy@alibaba-inc.com>
2017-06-16 11:53:39 -07:00
Victor Vieux 1227f628e6 From docker/docker - install: map debian_version 9.X to debian stretch without lsb_release
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-06-16 11:53:39 -07:00
Sebastiaan van Stijn fc65b226b8 From docker/docker - install dirmngr if needed
as of Ubuntu Yakkety, dirmngr is now in a separate
package (see https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1634464)

this patch updates the install script to install
the dirmngr package if it's not installed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-16 11:53:39 -07:00
Felix Abecassis 4d66d3f320 From docker/docker - install: map debian_version 9.X to debian stretch
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2017-06-16 11:53:39 -07:00
Christopher Jones 3fef86015f From docker/docker - add suggestions in failure message in install script
Adds suggestions to where you can install docker in the case
that the install script fails to install because of the architecture
not being officially supported.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-06-16 11:53:39 -07:00
Eric Curtin bb82a65659 From docker/docker - Add warning on docker group suggestion
Signed-off-by: Eric Curtin <ericcurtin17@gmail.com>
2017-06-16 11:53:39 -07:00
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