From 3f38fd0b62eb0e2397e9bef4bcf8227a33f5361c Mon Sep 17 00:00:00 2001 From: Jonathan Holloway Date: Wed, 9 Aug 2017 01:02:37 -0500 Subject: fix dockerfile gdeploy PyYAML pip/rpm conflict * PyYAML is already installed via pip form glusto image and gdeploy installs PyYAML as dependency from rpm. The resulting conflict fails the container build. Dockerfile: changed order of install, added glusto and pylint/pep8 defaults.yml: sets glusto defaults in container image Change-Id: I47eaa1fbe74cc619043d975034083c5766e6acd1 Signed-off-by: Jonathan Holloway --- docker/defaults/defaults.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docker/defaults/defaults.yml (limited to 'docker/defaults/defaults.yml') diff --git a/docker/defaults/defaults.yml b/docker/defaults/defaults.yml new file mode 100644 index 000000000..84d8e104d --- /dev/null +++ b/docker/defaults/defaults.yml @@ -0,0 +1,3 @@ +ssh_keyfile: "~/.ssh/id_rsa" +use_controlpersist: True +log_color: True -- cgit