From 5d246c5126f073e5ee9316d5278c93848dc3c2ab Mon Sep 17 00:00:00 2001 From: "Markus Kitsinger (SwooshyCueb)" Date: Wed, 18 Oct 2023 13:35:30 -0400 Subject: [PATCH] [104] Install python3-packaging in builder images --- externals_builder.almalinux8.Dockerfile | 9 +++++++++ externals_builder.centos7.Dockerfile | 1 + externals_builder.debian11.Dockerfile | 1 + externals_builder.debian12.Dockerfile | 1 + externals_builder.rocky9.Dockerfile | 9 +++++++++ externals_builder.ubuntu18.Dockerfile | 1 + externals_builder.ubuntu20.Dockerfile | 1 + externals_builder.ubuntu22.Dockerfile | 1 + plugin_builder.almalinux8.Dockerfile | 5 +++-- plugin_builder.centos7.Dockerfile | 1 + plugin_builder.debian11.Dockerfile | 1 + plugin_builder.debian12.Dockerfile | 1 + plugin_builder.rocky9.Dockerfile | 1 + plugin_builder.ubuntu18.Dockerfile | 1 + plugin_builder.ubuntu20.Dockerfile | 1 + plugin_builder.ubuntu22.Dockerfile | 1 + 16 files changed, 34 insertions(+), 2 deletions(-) diff --git a/externals_builder.almalinux8.Dockerfile b/externals_builder.almalinux8.Dockerfile index 9761ccb..13e0650 100644 --- a/externals_builder.almalinux8.Dockerfile +++ b/externals_builder.almalinux8.Dockerfile @@ -10,6 +10,14 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ dnf update -y || [ "$?" -eq 100 ] && \ rm -rf /tmp/* +RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ + --mount=type=cache,target=/var/cache/yum,sharing=locked \ + dnf install -y \ + dnf-plugins-core \ + && \ + dnf config-manager --set-enabled powertools && \ + rm -rf /tmp/* + RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ --mount=type=cache,target=/var/cache/yum,sharing=locked \ dnf install -y \ @@ -17,6 +25,7 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ git \ python3 \ python3-distro \ + python3-packaging \ gcc-toolset-11 \ && \ rm -rf /tmp/* diff --git a/externals_builder.centos7.Dockerfile b/externals_builder.centos7.Dockerfile index fee9800..251a580 100644 --- a/externals_builder.centos7.Dockerfile +++ b/externals_builder.centos7.Dockerfile @@ -19,6 +19,7 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ git \ python3 \ python36-distro \ + python36-packaging \ devtoolset-10-gcc \ devtoolset-10-gcc-c++ \ && \ diff --git a/externals_builder.debian11.Dockerfile b/externals_builder.debian11.Dockerfile index fa6ac51..045715c 100644 --- a/externals_builder.debian11.Dockerfile +++ b/externals_builder.debian11.Dockerfile @@ -27,6 +27,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ git \ python3 \ python3-distro \ + python3-packaging \ && \ rm -rf /tmp/* diff --git a/externals_builder.debian12.Dockerfile b/externals_builder.debian12.Dockerfile index 586057e..b592d6f 100644 --- a/externals_builder.debian12.Dockerfile +++ b/externals_builder.debian12.Dockerfile @@ -27,6 +27,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ git \ python3 \ python3-distro \ + python3-packaging \ && \ rm -rf /tmp/* diff --git a/externals_builder.rocky9.Dockerfile b/externals_builder.rocky9.Dockerfile index 8a69480..c994849 100644 --- a/externals_builder.rocky9.Dockerfile +++ b/externals_builder.rocky9.Dockerfile @@ -10,6 +10,14 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ dnf update -y || [ "$?" -eq 100 ] && \ rm -rf /tmp/* +RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ + --mount=type=cache,target=/var/cache/yum,sharing=locked \ + dnf install -y \ + dnf-plugins-core \ + && \ + dnf config-manager --set-enabled crb && \ + rm -rf /tmp/* + RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ --mount=type=cache,target=/var/cache/yum,sharing=locked \ dnf install -y \ @@ -17,6 +25,7 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ git \ python3 \ python3-distro \ + python3-packaging \ gcc-toolset-12 \ && \ rm -rf /tmp/* diff --git a/externals_builder.ubuntu18.Dockerfile b/externals_builder.ubuntu18.Dockerfile index a32b209..0f634b5 100644 --- a/externals_builder.ubuntu18.Dockerfile +++ b/externals_builder.ubuntu18.Dockerfile @@ -27,6 +27,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ git \ python3 \ python3-distro \ + python3-packaging \ && \ rm -rf /tmp/* diff --git a/externals_builder.ubuntu20.Dockerfile b/externals_builder.ubuntu20.Dockerfile index 65d2040..4b49913 100644 --- a/externals_builder.ubuntu20.Dockerfile +++ b/externals_builder.ubuntu20.Dockerfile @@ -27,6 +27,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ git \ python3 \ python3-distro \ + python3-packaging \ && \ rm -rf /tmp/* diff --git a/externals_builder.ubuntu22.Dockerfile b/externals_builder.ubuntu22.Dockerfile index 46cbdf9..bd82ea2 100644 --- a/externals_builder.ubuntu22.Dockerfile +++ b/externals_builder.ubuntu22.Dockerfile @@ -27,6 +27,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ git \ python3 \ python3-distro \ + python3-packaging \ && \ rm -rf /tmp/* diff --git a/plugin_builder.almalinux8.Dockerfile b/plugin_builder.almalinux8.Dockerfile index eec22ba..c75a0ef 100644 --- a/plugin_builder.almalinux8.Dockerfile +++ b/plugin_builder.almalinux8.Dockerfile @@ -13,6 +13,7 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ --mount=type=cache,target=/var/cache/yum,sharing=locked \ dnf install -y \ + dnf-plugins-core \ epel-release \ sudo \ wget \ @@ -20,17 +21,17 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ rpm-build \ gcc-c++ \ && \ + dnf config-manager --set-enabled powertools && \ rm -rf /tmp/* RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ --mount=type=cache,target=/var/cache/yum,sharing=locked \ dnf install -y \ - dnf-plugins-core \ python3 \ python3-devel \ + python3-packaging \ python3-pip \ && \ - dnf config-manager --set-enabled powertools && \ rm -rf /tmp/* # TODO: python3 is the only option at this time, so we don't really need this diff --git a/plugin_builder.centos7.Dockerfile b/plugin_builder.centos7.Dockerfile index 0e931f1..8faef74 100644 --- a/plugin_builder.centos7.Dockerfile +++ b/plugin_builder.centos7.Dockerfile @@ -24,6 +24,7 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ python3 \ python3-devel \ python3-pip \ + python36-packaging \ && \ rm -rf /tmp/* diff --git a/plugin_builder.debian11.Dockerfile b/plugin_builder.debian11.Dockerfile index 08928dd..e8cfc48 100644 --- a/plugin_builder.debian11.Dockerfile +++ b/plugin_builder.debian11.Dockerfile @@ -31,6 +31,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ lsb-release \ python3 \ python3-distro \ + python3-packaging \ python3-pip \ python3-setuptools \ sudo \ diff --git a/plugin_builder.debian12.Dockerfile b/plugin_builder.debian12.Dockerfile index e93be7a..464a769 100644 --- a/plugin_builder.debian12.Dockerfile +++ b/plugin_builder.debian12.Dockerfile @@ -31,6 +31,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ lsb-release \ python3 \ python3-distro \ + python3-packaging \ python3-pip \ python3-setuptools \ sudo \ diff --git a/plugin_builder.rocky9.Dockerfile b/plugin_builder.rocky9.Dockerfile index d88f80a..a12b1f3 100644 --- a/plugin_builder.rocky9.Dockerfile +++ b/plugin_builder.rocky9.Dockerfile @@ -29,6 +29,7 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ dnf install -y \ python3 \ python3-devel \ + python3-packaging \ python3-pip \ && \ rm -rf /tmp/* diff --git a/plugin_builder.ubuntu18.Dockerfile b/plugin_builder.ubuntu18.Dockerfile index 7402dc6..14a6f15 100644 --- a/plugin_builder.ubuntu18.Dockerfile +++ b/plugin_builder.ubuntu18.Dockerfile @@ -30,6 +30,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ libxml2-dev \ lsb-release \ python3 \ + python3-packaging \ python3-pip \ python3-setuptools \ sudo \ diff --git a/plugin_builder.ubuntu20.Dockerfile b/plugin_builder.ubuntu20.Dockerfile index dd5e967..3bc1f0e 100644 --- a/plugin_builder.ubuntu20.Dockerfile +++ b/plugin_builder.ubuntu20.Dockerfile @@ -31,6 +31,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ lsb-release \ python3 \ python3-distro \ + python3-packaging \ python3-pip \ python3-setuptools \ sudo \ diff --git a/plugin_builder.ubuntu22.Dockerfile b/plugin_builder.ubuntu22.Dockerfile index 73a9f49..eeb7ab3 100644 --- a/plugin_builder.ubuntu22.Dockerfile +++ b/plugin_builder.ubuntu22.Dockerfile @@ -31,6 +31,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ lsb-release \ python3 \ python3-distro \ + python3-packaging \ python3-pip \ python3-setuptools \ sudo \