diff --git a/.circleci/Dockerfile.debian b/.circleci/Dockerfile.debian index 5dfb191ba..a1a0c0cb1 100644 --- a/.circleci/Dockerfile.debian +++ b/.circleci/Dockerfile.debian @@ -8,15 +8,15 @@ ENV BUILD_SRC_ROOT /tmp/project RUN apt-get --quiet update && \ apt-get --quiet --yes install \ - git \ + git \ sudo \ - build-essential \ - python2.7 \ - python2.7-dev \ - libffi-dev \ - libssl-dev \ - libyaml-dev \ - virtualenv + build-essential \ + python2.7 \ + python2.7-dev \ + libffi-dev \ + libssl-dev \ + libyaml-dev \ + virtualenv # Get the project source. This is better than it seems. CircleCI will # *update* this checkout on each job run, saving us more time per-job. @@ -36,12 +36,12 @@ ENV BUILD_SRC_ROOT /tmp/project # Install just the runtime dependencies of Tahoe-LAFS RUN apt-get --quiet update && \ apt-get --quiet --yes install \ - python2.7 \ - libffi6 \ - libssl1.1 \ - libyaml-0-2 \ - virtualenv && \ git \ + python2.7 \ + libffi6 \ + libssl1.1 \ + libyaml-0-2 \ + virtualenv && \ rm -rf /var/lib/apt/lists/* COPY --from=builder ${VIRTUALENV_PATH} ${VIRTUALENV_PATH} diff --git a/.circleci/Dockerfile.ubuntu b/.circleci/Dockerfile.ubuntu index 1702e7d8b..32342e1a5 100644 --- a/.circleci/Dockerfile.ubuntu +++ b/.circleci/Dockerfile.ubuntu @@ -12,15 +12,15 @@ RUN apt-get --quiet update && \ apt-get --quiet --yes install git && \ apt-get --quiet --yes install \ sudo \ - build-essential \ - python2.7 \ - python2.7-dev \ - libffi-dev \ - libssl-dev \ - libyaml-dev \ - virtualenv \ - language-pack-en \ - iproute2 + build-essential \ + on2.7 \ + python2.7-dev \ + libffi-dev \ + libssl-dev \ + libyaml-dev \ + virtualenv \ + uage-pack-en \ + iproute2 # Get the project source. This is better than it seems. CircleCI will # *update* this checkout on each job run, saving us more time per-job.