Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Fix various CI failures #3061

Merged
merged 3 commits into from
Jul 13, 2017
Merged

Fix various CI failures #3061

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fdca71
Upgrade to Docker 17.06, including newer tools submodule
bboreham Jul 12, 2017
afac7c4
Change test 610 to use a Weaveworks container
bboreham Jul 13, 2017
fdbffce
Use modified docker-py to mask change in Docker error message
bboreham Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DOCKER_VERSION=1.13.1
DOCKER_VERSION=17.06
KUBERNETES_VERSION=1.6.2
KUBERNETES_CNI_VERSION=0.5.1
2 changes: 1 addition & 1 deletion tools
Open in desktop
Submodule tools updated 10 files
+22 −0 config_management/README.md
+2 −2 config_management/group_vars/all
+2 −0 config_management/roles/dev-tools/files/apt-daily.timer.conf
+8 −0 config_management/roles/dev-tools/tasks/main.yml
+1 −1 config_management/roles/docker-configuration/files/docker.conf
+35 −0 config_management/roles/docker-from-docker-ce-repo/tasks/debian.yml
+8 −27 config_management/roles/docker-from-docker-ce-repo/tasks/main.yml
+29 −0 config_management/roles/docker-from-docker-ce-repo/tasks/redhat.yml
+1 −1 config_management/roles/docker-from-get.docker.com/tasks/debian.yml
+1 −1 image-tag