Skip to content
This repository was archived by the owner on Jan 25, 2022. It is now read-only.

Commit

Permalink
Merge pull request #9 from ministryofjustice/docker_1_6_version
Browse files Browse the repository at this point in the history
Update the default docker version to 1.6.2
  • Loading branch information
mattmb committed Jun 23, 2015
2 parents 6b6e14a + 8361dd3 commit 8769e1a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## Unreleased
* Update the default docker version to 1.6.2

## Version 1.3.1
* Bump docker-py to version 1.2.2 this makes authenticating with private registries easier

Expand Down
2 changes: 1 addition & 1 deletion docker/map.jinja
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% set docker = salt['grains.filter_by']({
'Debian': {
'pkg': 'lxc-docker',
'pkg_version': '1.5.0',
'pkg_version': '1.6.2',
'py_version': '1.2.2',
},
'default': 'Debian',
Expand Down

0 comments on commit 8769e1a

Please sign in to comment.