Merge lp:~cjwatson/isitdeployable/docker-dependencies-steps into lp:isitdeployable

[Colin Watson]

Split Dockerfile installation of system dependencies into multiple steps.

This speeds things up when iterating on changes to dependencies.txt.docker.

[Adam Collard (adam-collard)]

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/isitdeployable-docker/35/

=== modified file 'Dockerfile'
--- Dockerfile	2018-01-30 15:33:52 +0000
+++ Dockerfile	2018-02-07 14:18:42 +0000
@@ -8,11 +8,12 @@
 WORKDIR /usr/src/app
 
 # install system dependencies (debs)
+RUN apt-get update \
+    && apt-get install -y software-properties-common \
+    && add-apt-repository --yes --update ppa:ubuntuone/isitdeployable-dependencies \
+    && apt-get upgrade -y
 COPY dependencies.txt.docker ./
 RUN apt-get update \
-    && apt-get install -y software-properties-common \
-    && apt-add-repository --yes ppa:ubuntuone/isitdeployable-dependencies \
-    && apt-get update && apt-get upgrade -y \
     && cat dependencies.txt.docker | xargs apt-get install -y --no-install-recommends \
     && apt-get autoremove -y \
     && apt-get clean \

=== modified file 'setup-container'
--- setup-container	2016-09-27 14:31:46 +0000
+++ setup-container	2018-02-07 14:18:42 +0000
@@ -26,9 +26,9 @@
 # Install software-properties-common for easy addition of PPA
 apt-get install -y software-properties-common
 # Add PPA containing codetree
-apt-add-repository --yes ppa:mojo-maintainers
+add-apt-repository --yes ppa:mojo-maintainers
 # Add PPA containing other dependencies
-apt-add-repository --yes ppa:ubuntuone/isitdeployable-dependencies
+add-apt-repository --yes ppa:ubuntuone/isitdeployable-dependencies
 apt-get update
 # Install apt dependencies
 cat dependencies.txt dependencies-devel.txt | xargs apt-get install -y --no-install-recommends