diff options
author | Patti Vacek <pattivacek@gmail.com> | 2021-02-01 08:36:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-01 08:36:34 +0100 |
commit | b2970f1565be5b7deae66135ddd809aa69d9ad1f (patch) | |
tree | 5d3564232a732d1ef5a2bc817ee737f32caf882a | |
parent | c8327e1bc05624b36192204f1bba7eb2e05409f2 (diff) | |
parent | 91abc988f5305e3307e9965a453302472446128a (diff) | |
download | meta-updater-b2970f1565be5b7deae66135ddd809aa69d9ad1f.tar.gz |
Merge pull request #799 from advancedtelematic/fix/python3-repo-bitbake
Update dockerfiles to use Debian Buster.
-rw-r--r-- | scripts/ci/Dockerfile.bitbake | 11 | ||||
-rw-r--r-- | 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 @@ | |||
1 | FROM debian:stretch | 1 | FROM debian:buster |
2 | LABEL Description="Image for bitbaking" | 2 | LABEL Description="Image for bitbaking" |
3 | 3 | ||
4 | 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 | 4 | 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 |
5 | 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 | 5 | 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 |
6 | RUN apt-get update -q && apt-get install --no-install-suggests --no-install-recommends -qy \ | 6 | RUN apt-get update -q && apt-get install --no-install-suggests --no-install-recommends -qy \ |
7 | awscli \ | 7 | awscli \ |
8 | build-essential \ | 8 | build-essential \ |
@@ -16,8 +16,8 @@ RUN apt-get update -q && apt-get install --no-install-suggests --no-install-reco | |||
16 | gcc-multilib \ | 16 | gcc-multilib \ |
17 | git-core \ | 17 | git-core \ |
18 | iputils-ping \ | 18 | iputils-ping \ |
19 | iproute \ | 19 | iproute2 \ |
20 | libpython-dev \ | 20 | libpython3-dev \ |
21 | libsdl1.2-dev \ | 21 | libsdl1.2-dev \ |
22 | libvirt-clients \ | 22 | libvirt-clients \ |
23 | libvirt-daemon-system \ | 23 | libvirt-daemon-system \ |
@@ -25,7 +25,6 @@ RUN apt-get update -q && apt-get install --no-install-suggests --no-install-reco | |||
25 | ovmf \ | 25 | ovmf \ |
26 | openssh-client \ | 26 | openssh-client \ |
27 | procps \ | 27 | procps \ |
28 | python \ | ||
29 | python3 \ | 28 | python3 \ |
30 | python3-pexpect \ | 29 | python3-pexpect \ |
31 | qemu-kvm \ | 30 | 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 @@ | |||
1 | FROM debian:stretch-slim | 1 | FROM debian:buster-slim |
2 | LABEL Description="Image for checking out updater-repo" | 2 | LABEL Description="Image for checking out updater-repo" |
3 | 3 | ||
4 | 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 | 4 | 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 |
5 | 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 | 5 | 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 |
6 | RUN apt-get update -q && apt-get install -qy \ | 6 | RUN apt-get update -q && apt-get install -qy \ |
7 | git \ | 7 | git \ |
8 | xmlstarlet \ | ||
9 | python3 \ | 8 | python3 \ |
10 | repo | 9 | repo \ |
10 | xmlstarlet | ||
11 | 11 | ||
12 | RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 2 | 12 | RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 2 |
13 | 13 | ||