From 886fba5401ddbf44c4075da14a2a9bce1713ee53 Mon Sep 17 00:00:00 2001 From: "Markus Kitsinger (SwooshyCueb)" Date: Wed, 18 Oct 2023 13:54:33 -0400 Subject: [PATCH] [103] install distro-CMake for all builders but centos7 and ubuntu18 --- externals_builder.almalinux8.Dockerfile | 1 + externals_builder.debian11.Dockerfile | 1 + externals_builder.debian12.Dockerfile | 1 + externals_builder.rocky9.Dockerfile | 1 + externals_builder.ubuntu20.Dockerfile | 1 + externals_builder.ubuntu22.Dockerfile | 1 + irods_core_builder.almalinux8.Dockerfile | 1 + irods_core_builder.debian11.Dockerfile | 1 + irods_core_builder.debian12.Dockerfile | 4 +--- irods_core_builder.rocky9.Dockerfile | 1 + irods_core_builder.ubuntu20.Dockerfile | 1 + irods_core_builder.ubuntu22.Dockerfile | 1 + plugin_builder.almalinux8.Dockerfile | 1 + plugin_builder.debian11.Dockerfile | 1 + plugin_builder.debian12.Dockerfile | 1 + plugin_builder.rocky9.Dockerfile | 1 + plugin_builder.ubuntu20.Dockerfile | 1 + plugin_builder.ubuntu22.Dockerfile | 1 + 18 files changed, 18 insertions(+), 3 deletions(-) diff --git a/externals_builder.almalinux8.Dockerfile b/externals_builder.almalinux8.Dockerfile index 13e0650..355eb2d 100644 --- a/externals_builder.almalinux8.Dockerfile +++ b/externals_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 \ sudo \ + cmake \ git \ python3 \ python3-distro \ diff --git a/externals_builder.debian11.Dockerfile b/externals_builder.debian11.Dockerfile index 045715c..3eb5b74 100644 --- a/externals_builder.debian11.Dockerfile +++ b/externals_builder.debian11.Dockerfile @@ -24,6 +24,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get update && \ apt-get install -y \ sudo \ + cmake \ git \ python3 \ python3-distro \ diff --git a/externals_builder.debian12.Dockerfile b/externals_builder.debian12.Dockerfile index b592d6f..d121812 100644 --- a/externals_builder.debian12.Dockerfile +++ b/externals_builder.debian12.Dockerfile @@ -24,6 +24,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get update && \ apt-get install -y \ sudo \ + cmake \ git \ python3 \ python3-distro \ diff --git a/externals_builder.rocky9.Dockerfile b/externals_builder.rocky9.Dockerfile index c994849..19c8949 100644 --- a/externals_builder.rocky9.Dockerfile +++ b/externals_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 \ sudo \ + cmake \ git \ python3 \ python3-distro \ diff --git a/externals_builder.ubuntu20.Dockerfile b/externals_builder.ubuntu20.Dockerfile index 4b49913..7ff7428 100644 --- a/externals_builder.ubuntu20.Dockerfile +++ b/externals_builder.ubuntu20.Dockerfile @@ -24,6 +24,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get update && \ apt-get install -y \ sudo \ + cmake \ git \ python3 \ python3-distro \ diff --git a/externals_builder.ubuntu22.Dockerfile b/externals_builder.ubuntu22.Dockerfile index bd82ea2..94f257c 100644 --- a/externals_builder.ubuntu22.Dockerfile +++ b/externals_builder.ubuntu22.Dockerfile @@ -24,6 +24,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get update && \ apt-get install -y \ sudo \ + cmake \ git \ python3 \ python3-distro \ 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.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.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/plugin_builder.almalinux8.Dockerfile b/plugin_builder.almalinux8.Dockerfile index c75a0ef..916835d 100644 --- a/plugin_builder.almalinux8.Dockerfile +++ b/plugin_builder.almalinux8.Dockerfile @@ -27,6 +27,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 \ + cmake \ python3 \ python3-devel \ python3-packaging \ diff --git a/plugin_builder.debian11.Dockerfile b/plugin_builder.debian11.Dockerfile index e8cfc48..a435f4e 100644 --- a/plugin_builder.debian11.Dockerfile +++ b/plugin_builder.debian11.Dockerfile @@ -25,6 +25,7 @@ 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 \ diff --git a/plugin_builder.debian12.Dockerfile b/plugin_builder.debian12.Dockerfile index 464a769..d240105 100644 --- a/plugin_builder.debian12.Dockerfile +++ b/plugin_builder.debian12.Dockerfile @@ -25,6 +25,7 @@ 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 \ diff --git a/plugin_builder.rocky9.Dockerfile b/plugin_builder.rocky9.Dockerfile index 972db9b..8a9ff17 100644 --- a/plugin_builder.rocky9.Dockerfile +++ b/plugin_builder.rocky9.Dockerfile @@ -27,6 +27,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 \ + cmake \ python3 \ python3-devel \ python3-distro \ diff --git a/plugin_builder.ubuntu20.Dockerfile b/plugin_builder.ubuntu20.Dockerfile index 3bc1f0e..128df10 100644 --- a/plugin_builder.ubuntu20.Dockerfile +++ b/plugin_builder.ubuntu20.Dockerfile @@ -25,6 +25,7 @@ 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 \ diff --git a/plugin_builder.ubuntu22.Dockerfile b/plugin_builder.ubuntu22.Dockerfile index eeb7ab3..ae60191 100644 --- a/plugin_builder.ubuntu22.Dockerfile +++ b/plugin_builder.ubuntu22.Dockerfile @@ -25,6 +25,7 @@ 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 \