From 2ef40504a0d5dac643b643271f21a6a07adb3e8e Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Tue, 19 Mar 2019 09:52:31 +0100 Subject: lava-xxx-base: permit to install 2019.03 LAVA has changed its repository location. Furthermore, it is now accessible via https which need additionnal package to use it. --- lava-master-base/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lava-master-base/Dockerfile') diff --git a/lava-master-base/Dockerfile b/lava-master-base/Dockerfile index 03b634f..fc7471a 100644 --- a/lava-master-base/Dockerfile +++ b/lava-master-base/Dockerfile @@ -20,16 +20,18 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \ sudo \ wget \ e2fsprogs \ + letsencrypt \ + apt-transport-https \ gnupg \ 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 \ +RUN wget https://apt.lavasoftware.org/lavasoftware.key.asc \ + && apt-key add lavasoftware.key.asc \ + && echo 'deb https://apt.lavasoftware.org/release stretch-backports main' > /etc/apt/sources.list.d/lava.list \ && apt-get clean && apt-get update && apt-get -y upgrade RUN service postgresql start \ - && DEBIAN_FRONTEND=noninteractive apt-get -y install lava \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install lava lava-server \ && sudo -u postgres psql lavaserver -c "DELETE FROM lava_scheduler_app_worker WHERE lava_scheduler_app_worker.hostname = 'example.com';" \ && service postgresql stop -- cgit From a2ca551b15f506fa418f63cf9002524ab4937f40 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Tue, 19 Mar 2019 09:55:08 +0100 Subject: lava-xxx-base: do not install recommended packages For limiting size of docker images, do not install recommended packages --- lava-master-base/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lava-master-base/Dockerfile') diff --git a/lava-master-base/Dockerfile b/lava-master-base/Dockerfile index fc7471a..ee7d47f 100644 --- a/lava-master-base/Dockerfile +++ b/lava-master-base/Dockerfile @@ -12,6 +12,8 @@ RUN echo 'lava-server lava-server/instance-name string lava-docker-instance' | && 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 +RUN echo "APT::Install-Recommends false;" > /etc/apt/apt.conf.d/01norecommands + # e2fsprogs is for libguestfs RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \ locales \ -- cgit