From 2ef40504a0d5dac643b643271f21a6a07adb3e8e Mon Sep 17 00:00:00 2001
From: Corentin LABBE <clabbe@baylibre.com>
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 ++++++----
 lava-slave-base/Dockerfile  | 12 +++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

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
 
diff --git a/lava-slave-base/Dockerfile b/lava-slave-base/Dockerfile
index ec884cf..5bca9b6 100644
--- a/lava-slave-base/Dockerfile
+++ b/lava-slave-base/Dockerfile
@@ -10,6 +10,8 @@ RUN \
  DEBIAN_FRONTEND=noninteractive apt-get -y install \
  locales \
  vim \
+ letsencrypt \
+ apt-transport-https \
  sudo \
  python-setproctitle \
  tftpd-hpa \
@@ -24,11 +26,11 @@ RUN \
 RUN if [ "$(uname -m)" = "x86_64" -o "$(uname -m)" = "x86" ] ;then apt-get -y install qemu-kvm ; fi
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget gnupg
-RUN wget http://images.validation.linaro.org/production-repo/production-repo.key.asc
-RUN apt-key add production-repo.key.asc
-RUN echo 'deb http://images.validation.linaro.org/production-repo/ stretch-backports main' > /etc/apt/sources.list.d/lava.list
-RUN echo "deb http://deb.debian.org/debian/ stretch-backports main" >> /etc/apt/sources.list
-RUN apt-get clean && apt-get update
+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 \
+ && echo "deb http://deb.debian.org/debian/ stretch-backports main" >> /etc/apt/sources.list \
+ && apt-get clean && apt-get update
 COPY 99-stretch-backports /etc/apt/preferences.d/
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install lava-dispatcher
 
-- 
cgit 1.2.3-korg