diff --git a/externals_builder.almalinux8.Dockerfile b/externals_builder.almalinux8.Dockerfile index 9761ccb..355eb2d 100644 --- a/externals_builder.almalinux8.Dockerfile +++ b/externals_builder.almalinux8.Dockerfile @@ -10,13 +10,23 @@ 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 \ + cmake \ 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..3eb5b74 100644 --- a/externals_builder.debian11.Dockerfile +++ b/externals_builder.debian11.Dockerfile @@ -24,9 +24,11 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get update && \ apt-get install -y \ sudo \ + cmake \ git \ python3 \ python3-distro \ + python3-packaging \ && \ rm -rf /tmp/* diff --git a/externals_builder.debian12.Dockerfile b/externals_builder.debian12.Dockerfile index 586057e..d121812 100644 --- a/externals_builder.debian12.Dockerfile +++ b/externals_builder.debian12.Dockerfile @@ -24,9 +24,11 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get update && \ apt-get install -y \ sudo \ + cmake \ git \ python3 \ python3-distro \ + python3-packaging \ && \ rm -rf /tmp/* diff --git a/externals_builder.rocky9.Dockerfile b/externals_builder.rocky9.Dockerfile index 8a69480..19c8949 100644 --- a/externals_builder.rocky9.Dockerfile +++ b/externals_builder.rocky9.Dockerfile @@ -10,13 +10,23 @@ 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 \ + cmake \ 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 190e212..0f634b5 100644 --- a/externals_builder.ubuntu18.Dockerfile +++ b/externals_builder.ubuntu18.Dockerfile @@ -25,9 +25,9 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get install -y \ sudo \ git \ - python \ python3 \ python3-distro \ + python3-packaging \ && \ rm -rf /tmp/* diff --git a/externals_builder.ubuntu20.Dockerfile b/externals_builder.ubuntu20.Dockerfile index 65d2040..7ff7428 100644 --- a/externals_builder.ubuntu20.Dockerfile +++ b/externals_builder.ubuntu20.Dockerfile @@ -24,9 +24,11 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get update && \ apt-get install -y \ sudo \ + cmake \ git \ python3 \ python3-distro \ + python3-packaging \ && \ rm -rf /tmp/* diff --git a/externals_builder.ubuntu22.Dockerfile b/externals_builder.ubuntu22.Dockerfile index 46cbdf9..94f257c 100644 --- a/externals_builder.ubuntu22.Dockerfile +++ b/externals_builder.ubuntu22.Dockerfile @@ -24,9 +24,11 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get update && \ apt-get install -y \ sudo \ + cmake \ git \ python3 \ python3-distro \ + python3-packaging \ && \ rm -rf /tmp/* diff --git a/irods_core_builder.almalinux8.Dockerfile b/irods_core_builder.almalinux8.Dockerfile index eba5bb6..33c9355 100644 --- a/irods_core_builder.almalinux8.Dockerfile +++ b/irods_core_builder.almalinux8.Dockerfile @@ -22,6 +22,7 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ --mount=type=cache,target=/var/cache/yum,sharing=locked \ dnf install -y \ ccache \ + cmake \ python3-devel \ python3-distro \ python3-jsonschema \ diff --git a/irods_core_builder.centos7.Dockerfile b/irods_core_builder.centos7.Dockerfile index 475a91a..1948b89 100644 --- a/irods_core_builder.centos7.Dockerfile +++ b/irods_core_builder.centos7.Dockerfile @@ -16,10 +16,7 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ && \ rm -rf /tmp/* -# python 2 and 3 must be installed separately because yum will ignore/discard python2 RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ - --mount=type=cache,target=/root/.cache/pip,sharing=locked \ - --mount=type=cache,target=/root/.cache/wheel,sharing=locked \ yum install -y \ ccache \ openssl \ @@ -30,17 +27,6 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ unixODBC-devel \ libjson-perl \ && \ - yum install -y \ - python \ - python-devel \ - python-distro \ - python2-packaging \ - python2-pip \ - python2-jsonschema \ - python2-psutil \ - python-requests \ - pyodbc \ - && \ yum install -y \ python36 \ python3-devel \ @@ -51,7 +37,6 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ python36-psutil \ python36-requests \ && \ - pip install --upgrade 'pip<21.0' && \ rm -rf /tmp/* RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ diff --git a/irods_core_builder.debian11.Dockerfile b/irods_core_builder.debian11.Dockerfile index 01d998a..827388e 100644 --- a/irods_core_builder.debian11.Dockerfile +++ b/irods_core_builder.debian11.Dockerfile @@ -27,6 +27,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get install -y \ apt-transport-https \ ccache \ + cmake \ g++-10 \ gcc \ gcc-10 \ diff --git a/irods_core_builder.debian12.Dockerfile b/irods_core_builder.debian12.Dockerfile index 8d14a6b..d0c68ca 100644 --- a/irods_core_builder.debian12.Dockerfile +++ b/irods_core_builder.debian12.Dockerfile @@ -25,6 +25,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get install -y \ apt-transport-https \ ccache \ + cmake \ g++-12 \ gcc \ gcc-12 \ @@ -89,9 +90,6 @@ RUN update-alternatives --install /usr/local/bin/gcc gcc /usr/bin/gcc-12 1 && \ update-alternatives --install /usr/local/bin/g++ g++ /usr/bin/g++-12 1 && \ hash -r -ARG cmake_path="/opt/irods-externals/cmake3.21.4-0/bin" -ENV PATH ${cmake_path}:$PATH - ENV file_extension "deb" ENV package_manager "apt-get" diff --git a/irods_core_builder.rocky9.Dockerfile b/irods_core_builder.rocky9.Dockerfile index 0ae8fa6..c859cec 100644 --- a/irods_core_builder.rocky9.Dockerfile +++ b/irods_core_builder.rocky9.Dockerfile @@ -22,6 +22,7 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ --mount=type=cache,target=/var/cache/yum,sharing=locked \ dnf install -y \ ccache \ + cmake \ lsof \ openssl \ openssl-devel \ diff --git a/irods_core_builder.ubuntu18.Dockerfile b/irods_core_builder.ubuntu18.Dockerfile index 7f15cae..d7541e4 100644 --- a/irods_core_builder.ubuntu18.Dockerfile +++ b/irods_core_builder.ubuntu18.Dockerfile @@ -21,8 +21,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - --mount=type=cache,target=/root/.cache/pip,sharing=locked \ - --mount=type=cache,target=/root/.cache/wheel,sharing=locked \ apt-get update && \ apt-get install -y \ apt-transport-https \ @@ -45,15 +43,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ninja-build \ odbc-postgresql \ postgresql \ - python \ - python-dev \ - python-pip \ - python-distro \ - python-jsonschema \ - python-packaging \ - python-psutil \ - python-pyodbc \ - python-requests \ python3 \ python3-pip \ python3-distro \ @@ -68,7 +57,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ wget \ zlib1g-dev \ && \ - pip install --upgrade 'pip<21.0' && \ rm -rf /tmp/* RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ diff --git a/irods_core_builder.ubuntu20.Dockerfile b/irods_core_builder.ubuntu20.Dockerfile index 8026d7b..0fe90d1 100644 --- a/irods_core_builder.ubuntu20.Dockerfile +++ b/irods_core_builder.ubuntu20.Dockerfile @@ -27,6 +27,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get install -y \ apt-transport-https \ ccache \ + cmake \ g++-10 \ gcc \ gcc-10 \ diff --git a/irods_core_builder.ubuntu22.Dockerfile b/irods_core_builder.ubuntu22.Dockerfile index 2fdc9e3..db35914 100644 --- a/irods_core_builder.ubuntu22.Dockerfile +++ b/irods_core_builder.ubuntu22.Dockerfile @@ -27,6 +27,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get install -y \ apt-transport-https \ ccache \ + cmake \ g++-11 \ gcc \ gcc-11 \ diff --git a/irods_runner.centos7.Dockerfile b/irods_runner.centos7.Dockerfile index 0a3ebda..2830841 100644 --- a/irods_runner.centos7.Dockerfile +++ b/irods_runner.centos7.Dockerfile @@ -20,7 +20,6 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ && \ rm -rf /tmp/* -# python 2 and 3 must be installed separately because yum will ignore/discard python2 RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ yum install -y \ openssl-devel \ @@ -28,14 +27,6 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ postgresql-server \ unixODBC-devel \ && \ - yum install -y \ - python \ - python-distro \ - python2-jsonschema \ - python2-psutil \ - python-requests \ - pyodbc \ - && \ yum install -y \ python36 \ python3-distro \ diff --git a/irods_runner.ubuntu18.Dockerfile b/irods_runner.ubuntu18.Dockerfile index 7eb464f..edaeab4 100644 --- a/irods_runner.ubuntu18.Dockerfile +++ b/irods_runner.ubuntu18.Dockerfile @@ -32,11 +32,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ sudo \ gnupg \ rsyslog \ - python \ - python-psutil \ - python-requests \ - python-jsonschema \ - python-distro \ python3 \ python3-psutil \ python3-requests \ diff --git a/plugin_builder.almalinux8.Dockerfile b/plugin_builder.almalinux8.Dockerfile index 58e5f22..916835d 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,20 +21,18 @@ 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 \ - --mount=type=cache,target=/root/.cache/pip,sharing=locked \ - --mount=type=cache,target=/root/.cache/wheel,sharing=locked \ dnf install -y \ - dnf-plugins-core \ + cmake \ python3 \ python3-devel \ + python3-packaging \ python3-pip \ && \ - python3 -m pip install --upgrade 'pip<21.0' && \ - 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 d53c097..8faef74 100644 --- a/plugin_builder.centos7.Dockerfile +++ b/plugin_builder.centos7.Dockerfile @@ -19,21 +19,13 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ && \ rm -rf /tmp/* -# python 2 and 3 must be installed separately because yum will ignore/discard python2 RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \ - --mount=type=cache,target=/root/.cache/pip,sharing=locked \ - --mount=type=cache,target=/root/.cache/wheel,sharing=locked \ yum install -y \ python3 \ python3-devel \ python3-pip \ + python36-packaging \ && \ - yum install -y \ - python \ - python-devel \ - python-pip \ - && \ - pip install --upgrade 'pip<21.0' && \ rm -rf /tmp/* ENV python="python3" diff --git a/plugin_builder.debian11.Dockerfile b/plugin_builder.debian11.Dockerfile index d044f70..a435f4e 100644 --- a/plugin_builder.debian11.Dockerfile +++ b/plugin_builder.debian11.Dockerfile @@ -21,24 +21,23 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - --mount=type=cache,target=/root/.cache/pip,sharing=locked \ - --mount=type=cache,target=/root/.cache/wheel,sharing=locked \ apt-get update && \ apt-get install --no-install-recommends -y \ apt-utils \ build-essential \ + cmake \ git \ gnupg \ libxml2-dev \ lsb-release \ python3 \ python3-distro \ + python3-packaging \ python3-pip \ python3-setuptools \ sudo \ wget \ && \ - pip install --upgrade 'pip<21.0' && \ rm -rf /tmp/* ENV python="python3" diff --git a/plugin_builder.debian12.Dockerfile b/plugin_builder.debian12.Dockerfile index e93be7a..d240105 100644 --- a/plugin_builder.debian12.Dockerfile +++ b/plugin_builder.debian12.Dockerfile @@ -25,12 +25,14 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get install --no-install-recommends -y \ apt-utils \ build-essential \ + cmake \ git \ gnupg \ libxml2-dev \ 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 985b069..8a9ff17 100644 --- a/plugin_builder.rocky9.Dockerfile +++ b/plugin_builder.rocky9.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,14 +21,17 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \ rpm-build \ gcc-c++ \ && \ + 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 \ + cmake \ python3 \ python3-devel \ python3-distro \ + python3-packaging \ python3-pip \ && \ rm -rf /tmp/* diff --git a/plugin_builder.ubuntu18.Dockerfile b/plugin_builder.ubuntu18.Dockerfile index b714065..14a6f15 100644 --- a/plugin_builder.ubuntu18.Dockerfile +++ b/plugin_builder.ubuntu18.Dockerfile @@ -21,8 +21,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - --mount=type=cache,target=/root/.cache/pip,sharing=locked \ - --mount=type=cache,target=/root/.cache/wheel,sharing=locked \ apt-get update && \ apt-get install --no-install-recommends -y \ apt-utils \ @@ -31,16 +29,13 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ gnupg \ libxml2-dev \ lsb-release \ - python \ - python-pip \ - python-setuptools \ python3 \ + python3-packaging \ python3-pip \ python3-setuptools \ sudo \ wget \ && \ - pip install --upgrade 'pip<21.0' && \ rm -rf /tmp/* ENV python="python3" diff --git a/plugin_builder.ubuntu20.Dockerfile b/plugin_builder.ubuntu20.Dockerfile index 830dbb1..128df10 100644 --- a/plugin_builder.ubuntu20.Dockerfile +++ b/plugin_builder.ubuntu20.Dockerfile @@ -21,24 +21,23 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - --mount=type=cache,target=/root/.cache/pip,sharing=locked \ - --mount=type=cache,target=/root/.cache/wheel,sharing=locked \ apt-get update && \ apt-get install --no-install-recommends -y \ apt-utils \ build-essential \ + cmake \ git \ gnupg \ libxml2-dev \ lsb-release \ python3 \ python3-distro \ + python3-packaging \ python3-pip \ python3-setuptools \ sudo \ wget \ && \ - pip install --upgrade 'pip<21.0' && \ rm -rf /tmp/* ENV python="python3" diff --git a/plugin_builder.ubuntu22.Dockerfile b/plugin_builder.ubuntu22.Dockerfile index 169d499..ae60191 100644 --- a/plugin_builder.ubuntu22.Dockerfile +++ b/plugin_builder.ubuntu22.Dockerfile @@ -21,24 +21,23 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - --mount=type=cache,target=/root/.cache/pip,sharing=locked \ - --mount=type=cache,target=/root/.cache/wheel,sharing=locked \ apt-get update && \ apt-get install --no-install-recommends -y \ apt-utils \ build-essential \ + cmake \ git \ gnupg \ libxml2-dev \ lsb-release \ python3 \ python3-distro \ + python3-packaging \ python3-pip \ python3-setuptools \ sudo \ wget \ && \ - pip install --upgrade 'pip<21.0' && \ rm -rf /tmp/* ENV python="python3"