diff options
| author | Matt Clay <matt@mystile.com> | 2017-10-13 12:54:37 -0700 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2017-10-13 15:07:02 -0700 |
| commit | 614a53734cbe8c1448b727f3b39383419ecad7b8 (patch) | |
| tree | 0858e0768679091c943ed168a8d08599030a646f /packaging | |
| parent | 297dfb1d501221c59ca52673ad127958ccd08ce0 (diff) | |
| download | ansible-614a53734cbe8c1448b727f3b39383419ecad7b8.tar.gz | |
Fix Debian packaging Dockerfile and docs.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/debian/Dockerfile | 6 | ||||
| -rw-r--r-- | packaging/debian/README.md | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packaging/debian/Dockerfile b/packaging/debian/Dockerfile index 6ff10f6585..559dc8d5ce 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 6e735fb3c5..74fc3a4cb9 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 ``` |