summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2017-10-20 15:04:09 +0200
committerCorentin LABBE <clabbe@baylibre.com>2017-10-24 09:52:54 +0200
commit7df65cb00afac966aa964cb15abf95b486480590 (patch)
tree5704adc8b8667555b215d91e462edda6a3c8f500
parent031469070cc488cf100f343b77bd4ecf0e3680a2 (diff)
Split some actions
This patch split some actions, making them more readable.
-rw-r--r--Dockerfile15
1 files changed, 9 insertions, 6 deletions
diff --git a/Dockerfile b/Dockerfile
index 5a66526..01b189d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,20 +11,23 @@ COPY scripts/start.sh .
# Log the hostname used during install for the slave name
RUN echo 'lava-server lava-server/instance-name string lava-docker-instance' | debconf-set-selections \
&& echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections \
- && echo 'locales locales/default_environment_locale select en_US.UTF-8' | debconf-set-selections \
- && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+ && echo 'locales locales/default_environment_locale select en_US.UTF-8' | debconf-set-selections
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
locales \
postgresql \
screen \
sudo \
wget \
gnupg \
- vim \
- && service postgresql start \
- && wget http://images.validation.linaro.org/production-repo/production-repo.key.asc \
+ vim
+
+RUN wget http://images.validation.linaro.org/production-repo/production-repo.key.asc \
&& apt-key add production-repo.key.asc \
&& echo 'deb http://images.validation.linaro.org/production-repo/ stretch-backports main' > /etc/apt/sources.list.d/lava.list \
- && apt-get clean && apt-get update \
+ && apt-get clean && apt-get update
+
+RUN service postgresql start \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install \
lava \
qemu-system \