OSDN Git Service
(root)
/
metasearch
/
grid-chef-repo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
17ab58a
)
updates docker4latest_ubuntu role.
author
whitestar
<whitestar@users.osdn.me>
Sat, 3 Feb 2018 07:56:12 +0000
(16:56 +0900)
committer
whitestar
<whitestar@users.osdn.me>
Sat, 3 Feb 2018 07:56:12 +0000
(16:56 +0900)
roles/docker4latest_ubuntu.rb
patch
|
blob
|
history
diff --git
a/roles/docker4latest_ubuntu.rb
b/roles/docker4latest_ubuntu.rb
index
ae7f8a7
..
9c65e84
100644
(file)
--- a/
roles/docker4latest_ubuntu.rb
+++ b/
roles/docker4latest_ubuntu.rb
@@
-35,7
+35,9
@@
override_attributes(
# install the package for the newer distribution of ubuntu.
'apt_repo' => {
# new repo.
# install the package for the newer distribution of ubuntu.
'apt_repo' => {
# new repo.
+ # Check https://download.docker.com/linux/ubuntu/dists
'override_apt_line' => 'deb [arch=amd64] https://download.docker.com/linux/ubuntu artful stable',
'override_apt_line' => 'deb [arch=amd64] https://download.docker.com/linux/ubuntu artful stable',
+ #'override_apt_line' => 'deb [arch=amd64] https://download.docker.com/linux/ubuntu zesty stable',
# old repo.
#'override_apt_line' => 'deb https://apt.dockerproject.org/repo ubuntu-zesty main',
#'override_apt_line' => 'deb https://apt.dockerproject.org/repo ubuntu-xenial main',
# old repo.
#'override_apt_line' => 'deb https://apt.dockerproject.org/repo ubuntu-zesty main',
#'override_apt_line' => 'deb https://apt.dockerproject.org/repo ubuntu-xenial main',
@@
-43,6
+45,7
@@
override_attributes(
'compose' => {
#'skip_setup' => true, # default: false
'auto_upgrade' => true, # default: false
'compose' => {
#'skip_setup' => true, # default: false
'auto_upgrade' => true, # default: false
+ # Check https://github.com/docker/compose/releases
'release_base_url' => 'https://github.com/docker/compose/releases/download/1.18.0',
#'release_base_url' => 'https://github.com/docker/compose/releases/download/1.17.1',
},
'release_base_url' => 'https://github.com/docker/compose/releases/download/1.18.0',
#'release_base_url' => 'https://github.com/docker/compose/releases/download/1.17.1',
},