From 91abc988f5305e3307e9965a453302472446128a Mon Sep 17 00:00:00 2001 From: Patti Vacek Date: Thu, 28 Jan 2021 16:37:29 +0100 Subject: Update dockerfiles to use Debian Buster. This should hopefully resolve some python3/repo issues. Signed-off-by: Patti Vacek --- scripts/ci/Dockerfile.bitbake | 11 +++++------ scripts/ci/Dockerfile.checkout | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/ci/Dockerfile.bitbake b/scripts/ci/Dockerfile.bitbake index 51eaa57..a638c6a 100644 --- a/scripts/ci/Dockerfile.bitbake +++ b/scripts/ci/Dockerfile.bitbake @@ -1,8 +1,8 @@ -FROM debian:stretch +FROM debian:buster LABEL Description="Image for bitbaking" -RUN sed -i 's#deb http://deb.debian.org/debian stretch main#deb http://deb.debian.org/debian stretch main contrib#g' /etc/apt/sources.list -RUN sed -i 's#deb http://deb.debian.org/debian stretch-updates main#deb http://deb.debian.org/debian stretch-updates main contrib#g' /etc/apt/sources.list +RUN sed -i 's#deb http://deb.debian.org/debian buster main#deb http://deb.debian.org/debian buster main contrib#g' /etc/apt/sources.list +RUN sed -i 's#deb http://deb.debian.org/debian buster-updates main#deb http://deb.debian.org/debian buster-updates main contrib#g' /etc/apt/sources.list RUN apt-get update -q && apt-get install --no-install-suggests --no-install-recommends -qy \ awscli \ build-essential \ @@ -16,8 +16,8 @@ RUN apt-get update -q && apt-get install --no-install-suggests --no-install-reco gcc-multilib \ git-core \ iputils-ping \ - iproute \ - libpython-dev \ + iproute2 \ + libpython3-dev \ libsdl1.2-dev \ libvirt-clients \ libvirt-daemon-system \ @@ -25,7 +25,6 @@ RUN apt-get update -q && apt-get install --no-install-suggests --no-install-reco ovmf \ openssh-client \ procps \ - python \ python3 \ python3-pexpect \ qemu-kvm \ diff --git a/scripts/ci/Dockerfile.checkout b/scripts/ci/Dockerfile.checkout index 8b9e052..6bfd9e3 100644 --- a/scripts/ci/Dockerfile.checkout +++ b/scripts/ci/Dockerfile.checkout @@ -1,13 +1,13 @@ -FROM debian:stretch-slim +FROM debian:buster-slim LABEL Description="Image for checking out updater-repo" -RUN sed -i 's#deb http://deb.debian.org/debian stretch main#deb http://deb.debian.org/debian stretch main contrib#g' /etc/apt/sources.list -RUN sed -i 's#deb http://deb.debian.org/debian stretch-updates main#deb http://deb.debian.org/debian stretch-updates main contrib#g' /etc/apt/sources.list +RUN sed -i 's#deb http://deb.debian.org/debian buster main#deb http://deb.debian.org/debian buster main contrib#g' /etc/apt/sources.list +RUN sed -i 's#deb http://deb.debian.org/debian buster-updates main#deb http://deb.debian.org/debian buster-updates main contrib#g' /etc/apt/sources.list RUN apt-get update -q && apt-get install -qy \ git \ - xmlstarlet \ python3 \ - repo + repo \ + xmlstarlet RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 2 -- cgit v1.2.3-54-g00ecf