[104] Install python3-packaging in builder images

irods · Oct 18, 2023 · 5d246c5 · 5d246c5
1 parent bfe1b6f
commit 5d246c5
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 2 deletions.
diff --git a/externals_builder.almalinux8.Dockerfile b/externals_builder.almalinux8.Dockerfile
@@ -10,13 +10,22 @@ 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 \
         sudo \
         git \
         python3 \
         python3-distro \
+        python3-packaging \
         gcc-toolset-11 \
     && \
     rm -rf /tmp/*

diff --git 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
@@ -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
@@ -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
@@ -10,13 +10,22 @@ 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 \
         sudo \
         git \
         python3 \
         python3-distro \
+        python3-packaging \
         gcc-toolset-12 \
     && \
     rm -rf /tmp/*

diff --git 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
@@ -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
@@ -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
@@ -13,24 +13,25 @@ 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 \
         git \
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \