Commit Graph
144 Commits
Author SHA1 Message Date
Eli Uriegas 2821149f0c Merge pull request #27 from seemethere/add_raspbian_stretch_support
Adds support for raspbian stretch
2017-08-30 13:36:59 -07:00
Eli Uriegas 69cada5b44 Merge pull request #23 from zhang-hua/use_china_mirror
Use mirror provided by AzureChinaCloud
2017-08-30 13:36:02 -07:00
Hua Zhang 506389d9c7 Use mirror provided by AzureChinaCloud and Aliyun
In order to install docker engine on Ubuntu from China mirror provided by
AzureChinaCloud and Aliyun if mirror option is present.

usage:
sh install --mirror AzureChinaCloud
sh install --mirror Aliyun

Without this change, the docker install will always fail on downloading
from global site due to network issue.

Signed-off-by: Hua Zhang <huazhan@microsoft.com>
2017-08-30 15:51:08 +08:00
Eli Uriegas f4956497c1 Add shellcheck, disable trusty armhf test
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-08-29 17:38:42 -07:00
Eli Uriegas d0e4b1fe59 Adds support for raspbian stretch
Basically uses the jessie repo for raspbian stretch due to raspbian
jessie download links being taken off the official raspbian site.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-08-29 15:17:56 -07:00
Andrew Hsu c34e43c284 Merge pull request #25 from seemethere/revert_raspbian_changes
Revert raspbian changes
2017-08-29 14:11:03 -07:00
Andrew Hsu 2b7a439763 Merge pull request #24 from seemethere/remove_mixed_tabs_spaces
Removes mixed tabs and spaces
2017-08-29 14:03:58 -07:00
Eli Uriegas 37d7820c01 Revert raspbian changes
Reverts raspbian changes back to https://apt.dockerproject.org, due to
issues with swarm in the newest release 17.07.0-ce related to issue
docker/swarmkit#2294.

This will stay in place for raspbian until that issue is resolved.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-08-29 11:59:43 -07:00
Eli Uriegas a74a8d17a6 Removes mixed tabs and spaces
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-08-29 11:06:51 -07:00
Eli Uriegas cfa611a019 Merge pull request #22 from seemethere/readd_aliyun_mirror
Re-adds Aliyun mirror option
2017-08-04 14:05:02 -07:00
Eli Uriegas 4874191db5 Merge pull request #21 from seemethere/update_readme
Remove outdated testing information
2017-08-04 12:47:22 -07:00
Eli Uriegas 80bb46ad57 Re-adds Aliyun mirror option
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-08-04 12:46:30 -07:00
Eli Uriegas 7a4d6b9c15 Remove outdated testing information
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-08-02 14:27:47 -07:00
Eli Uriegas 2502d65968 Merge pull request #19 from seemethere/update_jenkinsfile_x86_64
Update verification targets to include arch
2017-07-27 15:57:16 -07:00
Eli Uriegas 9eaa939397 Update verification targets to include arch
Ran into an issue with the jenkins build with archiving artifacts. Chose
to remedy this by naming all of the potential artifacts with the same
pattern

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-07-27 15:55:43 -07:00
Andrew Hsu 50b0f68e7a Merge pull request #18 from seemethere/update_for_170701rc1
Updates for 17.07.0-ce-rc1
2017-07-27 15:34:50 -07:00
Eli Uriegas 93b1990604 Updates for 17.07.0-ce-rc1
Major Notes:

* Removes old raspbian cruft now that raspbian has a repo on
download.docker.com
* Adds a support matrix so that we can have an easier time updating
what architectures/distros we support
* Added support for s390x and aarch64
* Had to change add-apt-repository to an echo into a file, was not
functioning correctly on raspbian see moby/moby#31405
* Update testing pipeline for multiarch
* Removed deprecation warnings for raspbian

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-07-27 10:24:02 -07:00
Eli Uriegas 29533f927c Merge pull request #15 from seemethere/remove_git_commit_verification
Removes version and git commit verification
2017-07-25 11:04:58 -07:00
Eli Uriegas def4691870 Removes version and git commit verification
The install script won't be updated every single time a release is done
so it does not make sense to tie the verification jobs to specific
versions / git commits.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-07-25 11:02:07 -07:00
Andrew Hsu 21098d1504 Merge pull request #14 from seemethere/add_sha_to_script
Adds sha to script
2017-07-18 15:06:49 -07:00
Andrew Hsu ddb4be0fce Merge pull request #12 from seemethere/fix_checks
Make testing working again!
2017-07-18 14:59:38 -07:00
Andrew Hsu 7e601fefa1 Merge pull request #13 from seemethere/make_fedora_actually_point_to_fedora
Make yum repo point to correct lsb_dist
2017-07-18 14:51:20 -07:00
Eli Uriegas 1586edbf11 Adds sha to script
The script doesn't have official versions but I think it would be smart
to add a commit sha to the script so that when issues can be tracked to
a specific sha of the script.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-07-18 14:46:07 -07:00
Eli Uriegas fed4aa7f07 Make yum repo point to correct lsb_dist
`yum_repo` mistakenly was hardcoded to `centos` now it should be based
off of `$lsb_dist`

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-07-18 14:38:10 -07:00
Eli Uriegas 00e526359b Make testing working again!
.log files didn't work correctly when evaluating possible docker images
to run so I removed the suffix portion. Also made it easier to run for
specific distros ala:

`make DISTROS="fedora-25 fedora-24 centos-7" CHANNEL_TO_TEST=edge EXPECTED_VERSION="17.06.0-ce" EXPECTED_GITCOMMIT="02c1d87" clean check`

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-07-18 14:31:49 -07:00
Eli Uriegas a35642d493 Merge pull request #11 from absenth/fedora26-fix
removed fast operator from makecache which is no longer supported in F26
2017-07-18 14:29:01 -07:00
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