Skip to content

Commit

Permalink
Merge pull request kubernetes#28745 from justinsb/fix_28644
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

kube-up: install new Docker pre-requisite (libltdl7) when not in image

Docker now has a dependency on libltdl7; we have to specify it manually
if we are installing docker using dpkg (vs using apt-get or similar,
which would pull it in automatically)

Fixes kubernetes#28644
  • Loading branch information
k8s-merge-robot authored Jul 13, 2016
2 parents 7823c57 + 4bde831 commit 2906a35
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions cluster/saltbase/salt/docker/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -376,11 +376,15 @@ purge-old-docker-package:
- mode: 644
- makedirs: true

libltdl7:
pkg.installed

docker-upgrade:
cmd.run:
- name: /opt/kubernetes/helpers/pkg install-no-start {{ docker_pkg_name }} {{ override_docker_ver }} /var/cache/docker-install/{{ override_deb }}
- require:
- file: /var/cache/docker-install/{{ override_deb }}
- pkg: libltdl7

{% endif %} # end override_docker_ver != ''

Expand Down

0 comments on commit 2906a35

Please sign in to comment.