[igt-dev] [PATCH i-g-t v2] Dockerfile.*debian*: Switch over to buster

Arkadiusz Hiler arkadiusz.hiler at intel.com
Wed Nov 20 11:02:42 UTC 2019


Debian Busters is the new stable so let's upgrade.

v2: stay on stretch for MIPS

Cc: Guillaume Tucker <guillaume.tucker at collabora.com>
Cc: Petri Latvala <petri.latvala at intel.com>
Issue: https://bugs.debian.org/932725
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
---
 Dockerfile.build-debian         |  6 ++----
 Dockerfile.build-debian-arm64   | 13 ++++++-------
 Dockerfile.build-debian-armhf   | 14 ++++++--------
 Dockerfile.build-debian-minimal | 10 ++++------
 Dockerfile.build-debian-mips    |  2 ++
 5 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/Dockerfile.build-debian b/Dockerfile.build-debian
index 36c51765..b143a532 100644
--- a/Dockerfile.build-debian
+++ b/Dockerfile.build-debian
@@ -17,10 +17,8 @@ RUN apt-get install -y \
 			libcurl4-openssl-dev \
 			python-docutils \
 			valgrind \
-			peg
-
-RUN apt-get install -t stretch-backports -y \
-					libdrm-intel1
+			peg \
+			libdrm-intel1
 
 # autotools build deps
 RUN apt-get install -y \
diff --git a/Dockerfile.build-debian-arm64 b/Dockerfile.build-debian-arm64
index 3ea97807..573c7096 100644
--- a/Dockerfile.build-debian-arm64
+++ b/Dockerfile.build-debian-arm64
@@ -1,4 +1,4 @@
-FROM debian:stretch-backports
+FROM debian:buster
 
 RUN apt-get update
 RUN apt-get install -y \
@@ -30,12 +30,11 @@ RUN apt-get install -y \
 			libjson-c-dev:arm64 \
 			libcurl4-openssl-dev:arm64 \
 			libxrandr-dev:arm64 \
-			libxv-dev:arm64
+			libxv-dev:arm64 \
+			meson \
+			libdrm-dev:arm64 \
+			qemu-user \
+			qemu-user-static
 
-RUN apt-get install -t stretch-backports -y \
-					meson \
-					libdrm-dev:arm64 \
-					qemu-user \
-					qemu-user-static
 
 RUN apt-get clean
diff --git a/Dockerfile.build-debian-armhf b/Dockerfile.build-debian-armhf
index 3e429e2f..737ca364 100644
--- a/Dockerfile.build-debian-armhf
+++ b/Dockerfile.build-debian-armhf
@@ -1,4 +1,4 @@
-FROM debian:stretch-backports
+FROM debian:buster
 
 RUN apt-get update
 RUN apt-get install -y \
@@ -30,12 +30,10 @@ RUN apt-get install -y \
 			libjson-c-dev:armhf \
 			libcurl4-openssl-dev:armhf \
 			libxrandr-dev:armhf \
-			libxv-dev:armhf
-
-RUN apt-get install -t stretch-backports -y \
-					meson \
-					libdrm-dev:armhf \
-					qemu-user \
-					qemu-user-static
+			libxv-dev:armhf \
+			meson \
+			libdrm-dev:armhf \
+			qemu-user \
+			qemu-user-static
 
 RUN apt-get clean
diff --git a/Dockerfile.build-debian-minimal b/Dockerfile.build-debian-minimal
index 7c23ffc2..64edf4b4 100644
--- a/Dockerfile.build-debian-minimal
+++ b/Dockerfile.build-debian-minimal
@@ -1,4 +1,4 @@
-FROM debian:stretch-backports
+FROM debian:buster
 
 RUN apt-get update
 RUN apt-get install -y \
@@ -18,10 +18,8 @@ RUN apt-get install -y \
 			libudev-dev \
 			libxrandr-dev \
 			libxv-dev \
-			x11proto-dri2-dev
-
-RUN apt-get install -t stretch-backports -y \
-					meson \
-					libdrm-dev
+			x11proto-dri2-dev \
+			meson \
+			libdrm-dev
 
 RUN apt-get clean
diff --git a/Dockerfile.build-debian-mips b/Dockerfile.build-debian-mips
index e56e7e75..7e4bacdf 100644
--- a/Dockerfile.build-debian-mips
+++ b/Dockerfile.build-debian-mips
@@ -1,3 +1,5 @@
+# we are stuck on stretch for mips:
+# https://bugs.debian.org/932725
 FROM debian:stretch-backports
 
 RUN apt-get update
-- 
2.23.0



More information about the igt-dev mailing list