diff options
author | Erik Rose <erik@mozilla.com> | 2016-01-06 01:29:52 +0300 |
---|---|---|
committer | Erik Rose <erik@mozilla.com> | 2016-01-06 01:29:52 +0300 |
commit | cad4e9800333ef052c8d9bf7719c1238cf1a8c35 (patch) | |
tree | b8aa26506d54b3c2441a63e50ff58accc35bb6ff /Dockerfile-dev | |
parent | e6cece580d03753874acc863ea3eb3fdeceb24a1 (diff) | |
parent | b1de1cd289b9070ee40b4710e761f9f4449923dc (diff) |
Merge in master to get up to date.
Bootstrap scripts and letsencrypt-auto itself required some merge work.
Diffstat (limited to 'Dockerfile-dev')
-rw-r--r-- | Dockerfile-dev | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Dockerfile-dev b/Dockerfile-dev index 23b6a0a88..78ee0c8e0 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -32,8 +32,7 @@ RUN /opt/letsencrypt/src/letsencrypt-auto --os-packages-only && \ # the above is not likely to change, so by putting it further up the # Dockerfile we make sure we cache as much as possible -# py26reqs.txt not installed! -COPY setup.py README.rst CHANGES.rst MANIFEST.in DISCLAIMER linter_plugin.py tox.cover.sh tox.ini pep8.travis.sh .pep8 .pylintrc /opt/letsencrypt/src/ +COPY setup.py README.rst CHANGES.rst MANIFEST.in linter_plugin.py tox.cover.sh tox.ini pep8.travis.sh .pep8 .pylintrc /opt/letsencrypt/src/ # all above files are necessary for setup.py, however, package source # code directory has to be copied separately to a subdirectory... |