From 614a53734cbe8c1448b727f3b39383419ecad7b8 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 13 Oct 2017 12:54:37 -0700 Subject: [PATCH] Fix Debian packaging Dockerfile and docs. --- packaging/debian/Dockerfile | 6 +++++- packaging/debian/README.md | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packaging/debian/Dockerfile b/packaging/debian/Dockerfile index 6ff10f65850..559dc8d5ce6 100644 --- a/packaging/debian/Dockerfile +++ b/packaging/debian/Dockerfile @@ -7,7 +7,11 @@ RUN apt-get update && apt-get install -y \ devscripts \ make \ pbuilder \ - python-setuptools + python-jinja2 \ + python-setuptools \ + python-yaml \ + && \ + apt-get clean VOLUME /ansible WORKDIR /ansible diff --git a/packaging/debian/README.md b/packaging/debian/README.md index 6e735fb3c5d..74fc3a4cb95 100644 --- a/packaging/debian/README.md +++ b/packaging/debian/README.md @@ -9,7 +9,6 @@ __Note__: You must run this target as root or set `PBUILDER_BIN='sudo pbuilder'` apt-get install asciidoc cdbs debootstrap devscripts make pbuilder python-setuptools git clone https://github.com/ansible/ansible.git cd ansible -git submodule update --init DEB_DIST='xenial trusty precise' make deb ``` @@ -18,7 +17,6 @@ Building in Docker: ``` git clone https://github.com/ansible/ansible.git cd ansible -git submodule update --init docker build -t ansible-deb-builder -f packaging/debian/Dockerfile . docker run --privileged -e DEB_DIST='trusty' -v $(pwd):/ansible ansible-deb-builder ```