From 109ca9592ed9031b32079433f7108e69e649808b Mon Sep 17 00:00:00 2001 From: Matt Pichette Date: Thu, 12 Dec 2024 16:00:56 -0400 Subject: [PATCH 1/5] Adding Android repo tool --- dockerfiles/debian/debian-12/debian-12-base/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile index e5fe51f..a82654b 100644 --- a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile +++ b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile @@ -25,6 +25,7 @@ RUN apt-get clean && \ python3 \ python3-pip \ python3-virtualenv \ + repo \ screen \ socat \ subversion \ From f808ffc0b83a0d57877ee11863e3ecc86fe3362c Mon Sep 17 00:00:00 2001 From: Matt Pichette Date: Mon, 16 Dec 2024 11:52:01 -0400 Subject: [PATCH 2/5] Adding required QT tools --- dockerfiles/debian/debian-12/debian-12-base/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile index a82654b..49cf691 100644 --- a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile +++ b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get clean && \ fluxbox \ gawk \ git-core \ + git-lfs \ locales \ lz4 \ procps \ From 76b6258dff86c10e96a4bdd8abaa3cdc51645309 Mon Sep 17 00:00:00 2001 From: Matt Pichette Date: Mon, 16 Dec 2024 11:55:30 -0400 Subject: [PATCH 3/5] Adding required QT tools --- dockerfiles/debian/debian-12/debian-12-base/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile index 49cf691..3dd019f 100644 --- a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile +++ b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile @@ -8,7 +8,9 @@ FROM debian:12 ARG TARGETPLATFORM -RUN apt-get clean && \ +RUN deb https://deb.debian.org/debian bookworm main contrib && \ + deb-src https://deb.debian.org/debian bookworm main contrib && \ + apt-get clean && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential \ From f57c19b638c089de0c47c6239e9c255da3888adc Mon Sep 17 00:00:00 2001 From: Matt Pichette Date: Mon, 16 Dec 2024 11:58:04 -0400 Subject: [PATCH 4/5] Adding required QT tools --- dockerfiles/debian/debian-12/debian-12-base/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile index 3dd019f..9ede2e9 100644 --- a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile +++ b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile @@ -8,8 +8,8 @@ FROM debian:12 ARG TARGETPLATFORM -RUN deb https://deb.debian.org/debian bookworm main contrib && \ - deb-src https://deb.debian.org/debian bookworm main contrib && \ +RUN echo "deb https://deb.debian.org/debian bookworm main contrib" >> /etc/apt/sources.list && \ + echo "deb-src https://deb.debian.org/debian bookworm main contrib" >> /etc/apt/sources.list && \ apt-get clean && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ From ca3b7a5b5680a5e38b9b369f413d0c913c25412b Mon Sep 17 00:00:00 2001 From: Matt Pichette Date: Mon, 16 Dec 2024 12:01:46 -0400 Subject: [PATCH 5/5] Adding required QT tools --- dockerfiles/debian/debian-12/debian-12-base/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile index 9ede2e9..cbd30a1 100644 --- a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile +++ b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile @@ -8,8 +8,7 @@ FROM debian:12 ARG TARGETPLATFORM -RUN echo "deb https://deb.debian.org/debian bookworm main contrib" >> /etc/apt/sources.list && \ - echo "deb-src https://deb.debian.org/debian bookworm main contrib" >> /etc/apt/sources.list && \ +RUN sed -i 's/^Components: main$/& contrib/' /etc/apt/sources.list.d/debian.sources && \ apt-get clean && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \