Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various improvements (round 2) #107

Merged
merged 4 commits into from
Oct 19, 2023
Merged

Various improvements (round 2) #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce6bb62
[#89] Remove (most) Python 2 remnants
SwooshyCueb Oct 18, 2023
79a7c88
[#105] rocky9: enable crb for plugin builder image
SwooshyCueb Oct 18, 2023
2e3644e
[#104] Install python3-packaging in builder images
SwooshyCueb Oct 18, 2023
f101d78
[#103] install distro-CMake for all builders but centos7 and ubuntu18
SwooshyCueb Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions externals_builder.almalinux8.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
1 change: 1 addition & 0 deletions externals_builder.centos7.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++ \
&& \
Expand Down
2 changes: 2 additions & 0 deletions externals_builder.debian11.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*

Expand Down
2 changes: 2 additions & 0 deletions externals_builder.debian12.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*

Expand Down
10 changes: 10 additions & 0 deletions externals_builder.rocky9.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
2 changes: 1 addition & 1 deletion externals_builder.ubuntu18.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*

Expand Down
2 changes: 2 additions & 0 deletions externals_builder.ubuntu20.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*

Expand Down
2 changes: 2 additions & 0 deletions externals_builder.ubuntu22.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*

Expand Down
1 change: 1 addition & 0 deletions irods_core_builder.almalinux8.Dockerfile
View file
Open in desktop
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
15 changes: 0 additions & 15 deletions irods_core_builder.centos7.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions irods_core_builder.debian11.Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
12 changes: 0 additions & 12 deletions irods_core_builder.ubuntu18.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions irods_core_builder.ubuntu20.Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
9 changes: 0 additions & 9 deletions irods_runner.centos7.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,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 \
yum install -y \
openssl-devel \
lsof \
postgresql-server \
unixODBC-devel \
&& \
yum install -y \
python \
python-distro \
python2-jsonschema \
python2-psutil \
python-requests \
pyodbc \
&& \
yum install -y \
python36 \
python3-distro \
Expand Down
5 changes: 0 additions & 5 deletions irods_runner.ubuntu18.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
9 changes: 4 additions & 5 deletions plugin_builder.almalinux8.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,26 @@ 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 \
--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
Expand Down
10 changes: 1 addition & 9 deletions plugin_builder.centos7.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions plugin_builder.debian11.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions plugin_builder.debian12.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading