-
Notifications
You must be signed in to change notification settings - Fork 712
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed 'tools/' changes from 0d6d4da..74dc626
74dc626 Merge pull request #108 from weaveworks/disable-apt-daily b4f1d91 Merge pull request #107 from weaveworks/docker-17-update 7436aa1 Override apt daily job to not run immediately on boot 7980f15 Merge pull request #106 from weaveworks/document-docker-install-role f741e53 Bump to Docker 17.06 from CE repo 61796a1 Update Docker CE Debian repo details 0d86f5e Allow for Docker package to be named docker-ce 065c68d Document selection of Docker installation role. 3809053 Just --porcelain; it defaults to v1 11400ea Merge pull request #105 from weaveworks/remove-weaveplugin-remnants b8b4d64 remove weaveplugin remnants 35099c9 Merge pull request #104 from weaveworks/pull-docker-py cdd48fc Pull docker-py to speed tests/builds up. e1c6c24 Merge pull request #103 from weaveworks/test-build-tags d5d71e0 Add -tags option so callers can pass in build tags 8949b2b Merge pull request #98 from weaveworks/git-status-tag ac30687 Merge pull request #100 from weaveworks/python_linting 4b125b5 Pin yapf & flake8 versions 7efb485 Lint python linting function 444755b Swap diff direction to reflect changes required c5b2434 Install flake8 & yapf 5600eac Lint python in build-tools repo 0b02ca9 Add python linting c011c0d Merge pull request #79 from kinvolk/schu/python-shebang 6577d07 Merge pull request #99 from weaveworks/shfmt-version 00ce0dc Use git status instead of diff to add 'WIP' tag 411fd13 Use shfmt v1.3.0 instead of latest from master. 31d069d Change Python shebang to `#!/usr/bin/env python` git-subtree-dir: tools git-subtree-split: 74dc626b6de3ffb38591510f7cb7bc2db33743c4
- Loading branch information
Showing
20 changed files
with
650 additions
and
438 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
[Timer] | ||
Persistent=false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
[Service] | ||
ExecStart= | ||
ExecStart=/usr/bin/docker daemon -H fd:// -H unix:///var/run/alt-docker.sock -H tcp://0.0.0.0:2375 -s overlay --insecure-registry "weave-ci-registry:5000" | ||
ExecStart=/usr/bin/dockerd -H fd:// -H unix:///var/run/alt-docker.sock -H tcp://0.0.0.0:2375 -s overlay --insecure-registry "weave-ci-registry:5000" |
35 changes: 35 additions & 0 deletions
35
config_management/roles/docker-from-docker-ce-repo/tasks/debian.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
--- | ||
# Debian / Ubuntu specific: | ||
|
||
- name: install dependencies for docker repository | ||
package: | ||
name: "{{ item }}" | ||
state: present | ||
with_items: | ||
- apt-transport-https | ||
- ca-certificates | ||
|
||
- name: add apt key for the docker repository | ||
apt_key: | ||
keyserver: hkp://ha.pool.sks-keyservers.net:80 | ||
id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 | ||
state: present | ||
register: apt_key_docker_repo | ||
|
||
- name: add docker's apt repository ({{ ansible_distribution | lower }}-{{ ansible_distribution_release }}) | ||
apt_repository: | ||
repo: deb https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename|lower }} stable | ||
state: present | ||
register: apt_docker_repo | ||
|
||
- name: update apt's cache | ||
apt: | ||
update_cache: yes | ||
when: apt_key_docker_repo.changed or apt_docker_repo.changed | ||
|
||
- name: install docker-engine | ||
package: | ||
name: "{{ item }}" | ||
state: present | ||
with_items: | ||
- docker-ce={{ docker_version }}* |
35 changes: 8 additions & 27 deletions
35
config_management/roles/docker-from-docker-ce-repo/tasks/main.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,10 @@ | ||
# Docker installation from Docker's CentOS Community Edition | ||
# See also: https://docs.docker.com/engine/installation/linux/centos/ | ||
--- | ||
# Set up Docker | ||
# See also: https://docs.docker.com/engine/installation/linux/ubuntulinux/#install | ||
|
||
- name: remove all potentially pre existing packages | ||
yum: | ||
name: '{{ item }}' | ||
state: absent | ||
with_items: | ||
- docker | ||
- docker-common | ||
- container-selinux | ||
- docker-selinux | ||
- docker-engine | ||
# Distribution-specific tasks: | ||
- include: debian.yml | ||
when: ansible_os_family == "Debian" | ||
|
||
- name: install yum-utils | ||
yum: | ||
name: yum-utils | ||
state: present | ||
|
||
- name: add docker ce repo | ||
command: yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo | ||
|
||
# Note that Docker CE versions do not follow regular Docker versions, but look | ||
# like, for example: "17.03.0.el7" | ||
- name: install docker | ||
yum: | ||
name: 'docker-ce-{{ docker_version }}' | ||
update_cache: yes | ||
state: present | ||
- include: redhat.yml | ||
when: ansible_os_family == "RedHat" |
29 changes: 29 additions & 0 deletions
29
config_management/roles/docker-from-docker-ce-repo/tasks/redhat.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# Docker installation from Docker's CentOS Community Edition | ||
# See also: https://docs.docker.com/engine/installation/linux/centos/ | ||
|
||
- name: remove all potentially pre existing packages | ||
yum: | ||
name: '{{ item }}' | ||
state: absent | ||
with_items: | ||
- docker | ||
- docker-common | ||
- container-selinux | ||
- docker-selinux | ||
- docker-engine | ||
|
||
- name: install yum-utils | ||
yum: | ||
name: yum-utils | ||
state: present | ||
|
||
- name: add docker ce repo | ||
command: yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo | ||
|
||
# Note that Docker CE versions do not follow regular Docker versions, but look | ||
# like, for example: "17.03.0.el7" | ||
- name: install docker | ||
yum: | ||
name: 'docker-ce-{{ docker_version }}' | ||
update_cache: yes | ||
state: present |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.