summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhilman <khilman@users.noreply.github.com>2018-11-26 15:18:05 -0800
committerGitHub <noreply@github.com>2018-11-26 15:18:05 -0800
commit048d3751fabc7edb66d5bbd0349b5936f1d04f29 (patch)
treea1a32a406ed177ea18461fc9e03bf953500a2646
parentde35d605d56368275d9447545e4ba4fec211c789 (diff)
parent264bf6ca9bdf8f92736f0296938740586bf7004c (diff)
Merge pull request #70 from montjoie/support_2018.11
base-images: permit to install LAVA 2018.11
-rw-r--r--lava-master-base/99-stretch-backports35
-rw-r--r--lava-master-base/Dockerfile4
-rw-r--r--lava-slave-base/99-stretch-backports19
-rw-r--r--lava-slave-base/Dockerfile2
4 files changed, 59 insertions, 1 deletions
diff --git a/lava-master-base/99-stretch-backports b/lava-master-base/99-stretch-backports
new file mode 100644
index 0000000..a513bd1
--- /dev/null
+++ b/lava-master-base/99-stretch-backports
@@ -0,0 +1,35 @@
+Package: python3-requests
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: python3-chardet
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: python3-urllib3
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: lava-common
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: lava-dispatcher
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: lava
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: lava-server
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: lava-dev
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: lava-server-doc
+Pin: release n=stretch-backports
+Pin-Priority: 500
diff --git a/lava-master-base/Dockerfile b/lava-master-base/Dockerfile
index ef4ff2f..03b634f 100644
--- a/lava-master-base/Dockerfile
+++ b/lava-master-base/Dockerfile
@@ -1,6 +1,7 @@
FROM bitnami/minideb:stretch
RUN echo "deb http://deb.debian.org/debian/ stretch-backports main" >> /etc/apt/sources.list
+COPY 99-stretch-backports /etc/apt/preferences.d/
RUN apt-get update
@@ -25,7 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
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 && apt-get -y upgrade
RUN service postgresql start \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install lava \
@@ -50,6 +51,7 @@ COPY scripts/lava-server-gunicorn /etc/init.d/
RUN chmod 755 /etc/init.d/lava-server-gunicorn
RUN dpkg -l | grep lava
+RUN dpkg -l | grep lava | sed 's,[[:space:]][[:space:]]*, ,g' | cut -d' ' -f3 | tr '+~' _
EXPOSE 80 3079 5555 5556
diff --git a/lava-slave-base/99-stretch-backports b/lava-slave-base/99-stretch-backports
new file mode 100644
index 0000000..f8c087b
--- /dev/null
+++ b/lava-slave-base/99-stretch-backports
@@ -0,0 +1,19 @@
+Package: python3-requests
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: python3-chardet
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: python3-urllib3
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: lava-common
+Pin: release n=stretch-backports
+Pin-Priority: 500
+
+Package: lava-dispatcher
+Pin: release n=stretch-backports
+Pin-Priority: 500
diff --git a/lava-slave-base/Dockerfile b/lava-slave-base/Dockerfile
index 17286ca..ec884cf 100644
--- a/lava-slave-base/Dockerfile
+++ b/lava-slave-base/Dockerfile
@@ -27,7 +27,9 @@ 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
+COPY 99-stretch-backports /etc/apt/preferences.d/
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install lava-dispatcher
COPY scripts/lava-slave /etc/init.d/