diff options
| author | Brad Warren <bmw@users.noreply.github.com> | 2017-08-09 01:31:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 01:31:41 +0300 |
| commit | 6c52cc49a7fdf05b00aaac2385c6f5d9c54b72ec (patch) | |
| tree | 28595ad205860af21b7ffe08f9fce05b563be190 | |
| parent | 47b3d19170f20cbc22f54d82457c057dd6473f66 (diff) | |
Pin dependencies in compatibility tests. (#5004)
We now use tools/pip_install_editable.sh which installs our packages using the
pinned versions from certbot-auto.
We also use letsencrypt-auto-source/letsencrypt-auto instead of certbot-auto in
the root to:
1. Make sure OS bootstrappers are up to date with master.
2. Copy letsencrypt-auto-source into our tree so it can be used by
tools/pip_install_editable.sh later.
| -rw-r--r-- | certbot-compatibility-test/Dockerfile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/certbot-compatibility-test/Dockerfile b/certbot-compatibility-test/Dockerfile index bb9359ce8..fe55a68a6 100644 --- a/certbot-compatibility-test/Dockerfile +++ b/certbot-compatibility-test/Dockerfile @@ -8,8 +8,8 @@ MAINTAINER Brad Warren <bmw@eff.org> # TODO: Install non-default Python versions for tox. # TODO: Install Apache/Nginx for plugin development. -COPY certbot-auto /opt/certbot/src/certbot-auto -RUN /opt/certbot/src/certbot-auto -n --os-packages-only +COPY letsencrypt-auto-source /opt/certbot/src/letsencrypt-auto-source +RUN /opt/certbot/src/letsencrypt-auto-source/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 @@ -29,16 +29,18 @@ COPY acme /opt/certbot/src/acme/ COPY certbot-apache /opt/certbot/src/certbot-apache/ COPY certbot-nginx /opt/certbot/src/certbot-nginx/ COPY certbot-compatibility-test /opt/certbot/src/certbot-compatibility-test/ +COPY tools /opt/certbot/src/tools RUN virtualenv --no-site-packages -p python2 /opt/certbot/venv && \ /opt/certbot/venv/bin/pip install -U setuptools && \ - /opt/certbot/venv/bin/pip install -U pip && \ - /opt/certbot/venv/bin/pip install \ - -e /opt/certbot/src/acme \ - -e /opt/certbot/src \ - -e /opt/certbot/src/certbot-apache \ - -e /opt/certbot/src/certbot-nginx \ - -e /opt/certbot/src/certbot-compatibility-test + /opt/certbot/venv/bin/pip install -U pip +ENV PATH /opt/certbot/venv/bin:$PATH +RUN /opt/certbot/src/tools/pip_install_editable.sh \ + /opt/certbot/src/acme \ + /opt/certbot/src \ + /opt/certbot/src/certbot-apache \ + /opt/certbot/src/certbot-nginx \ + /opt/certbot/src/certbot-compatibility-test # install in editable mode (-e) to save space: it's not possible to # "rm -rf /opt/certbot/src" (it's stays in the underlaying image); @@ -46,5 +48,3 @@ RUN virtualenv --no-site-packages -p python2 /opt/certbot/venv && \ # bash" and investigate, apply patches, etc. WORKDIR /opt/certbot/src/certbot-compatibility-test/certbot_compatibility_test/testdata - -ENV PATH /opt/certbot/venv/bin:$PATH |