Skip to content

Commit

Permalink
[103] install distro-CMake for all builders but centos7 and ubuntu18
Browse files Browse the repository at this point in the history
  • Loading branch information
SwooshyCueb committed Oct 18, 2023
1 parent a965e6c commit 886fba5
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 3 deletions.
1 change: 1 addition & 0 deletions externals_builder.almalinux8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions externals_builder.debian11.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions externals_builder.debian12.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions externals_builder.rocky9.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions externals_builder.ubuntu20.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions externals_builder.ubuntu22.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions irods_core_builder.almalinux8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions irods_core_builder.debian11.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 1 addition & 3 deletions irods_core_builder.debian12.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions irods_core_builder.rocky9.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions irods_core_builder.ubuntu20.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions irods_core_builder.ubuntu22.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions plugin_builder.almalinux8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions plugin_builder.debian11.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions plugin_builder.debian12.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions plugin_builder.rocky9.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions plugin_builder.ubuntu20.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions plugin_builder.ubuntu22.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 886fba5

Please sign in to comment.