Merge branch 'master' into vscode

caarlos0-graveyard · Mar 8, 2017 · dd836e8 · dd836e8
2 parents 765ea1f + 5c4490f
commit dd836e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/setup b/setup
@@ -17,7 +17,7 @@ if test "$(uname)" = "Darwin"; then
     brew upgrade ansible
   fi
 elif test "$(uname)" = "Linux"; then
-  if test -f /etc/lsb-release -a ! "$(which ansible)"; then
+  if test -f /etc/lsb-release && test ! "$(which ansible)"; then
     echo "Installing ansible..."
     sudo apt-get install -y software-properties-common
     sudo apt-add-repository -y ppa:ansible/ansible

diff --git a/tasks/docker.yml b/tasks/docker.yml
@@ -1,3 +1,6 @@
+- name: Add Docker keys
+  apt_key: url=https://apt.dockerproject.org/gpg
+  when: is_ubuntu13_plus
 - name: Add Docker repository
   apt_repository: repo='deb https://apt.dockerproject.org/repo ubuntu-{{ ansible_distribution_release }} main'
   when: is_ubuntu13_plus