Skip to content

Commit ad1d19c

Browse files
authored
Merge pull request #13580 from KratosMultiphysics/ci/bump-boost-ubuntu-docker
[CI] Adding new boost version to docker files
2 parents 3049cd2 + d5bf929 commit ad1d19c

4 files changed

Lines changed: 77 additions & 145 deletions

File tree

scripts/docker_files/docker_file_ci_ubuntu_20_04/DockerFile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ RUN apt-get update -y && apt-get upgrade -y && \
7676
apt-get -y autoremove && \
7777
apt-get clean
7878

79+
# Install Boost (form zip)
80+
RUN wget -P /workspace/boost https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz &&\
81+
tar -C /workspace/boost -xzf /workspace/boost/boost_1_87_0.tar.gz && \
82+
rm /workspace/boost/boost_1_87_0.tar.gz
83+
7984
CMD [ "/bin/bash" ]
8085

8186
WORKDIR $HOME

scripts/docker_files/docker_file_ci_ubuntu_22_04/DockerFile

Lines changed: 72 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,92 @@
11
FROM ubuntu:jammy
22

3-
ENV HOME /root
3+
ENV HOME=/root
44

5-
RUN apt-get update -y && apt-get upgrade -y && \
6-
apt-get -y install --no-install-recommends \
7-
gnupg2 \
8-
software-properties-common \
9-
wget && \
10-
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB -P/tmp && \
5+
# Update and install necessary packages
6+
RUN apt-get update -y && apt-get upgrade -y
7+
RUN apt-get -y install --no-install-recommends gnupg2 software-properties-common wget
8+
9+
# Adding intel ppa and installing packages
10+
RUN wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB -P/tmp && \
1111
apt-key add /tmp/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB && \
1212
rm /tmp/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB && \
13-
echo deb https://apt.repos.intel.com/oneapi all main > /etc/apt/sources.list.d/oneAPI.list && \
14-
add-apt-repository ppa:git-core/ppa && \
15-
apt-get -y update && \
16-
apt-get install -y --no-install-recommends \
17-
sudo \
18-
build-essential \
19-
g++-12 \
20-
gfortran-12 \
21-
clang-14 \
22-
libomp-dev \
23-
cmake \
24-
gfortran \
25-
git \
26-
intel-oneapi-compiler-dpcpp-cpp \
27-
intel-oneapi-mkl-devel \
28-
libboost-dev \
29-
libhdf5-dev \
30-
libhdf5-openmpi-dev \
31-
libmetis-dev \
32-
libopenmpi-dev \
33-
libscotch-dev \
34-
libtrilinos-amesos-dev \
35-
libtrilinos-amesos2-dev \
36-
libtrilinos-aztecoo-dev \
37-
libtrilinos-epetra-dev \
38-
libtrilinos-epetraext-dev \
39-
libtrilinos-ifpack-dev \
40-
libtrilinos-ml-dev \
41-
libtrilinos-teuchos-dev \
42-
libtrilinos-tpetra-dev \
43-
libtrilinos-kokkos-dev \
44-
libtrilinos-kokkos-kernels-dev \
45-
libtrilinos-shylu-dev \
46-
libmedc-dev \
47-
openmpi-bin \
48-
python3-dev \
49-
python3-h5py \
50-
python3-pip && \
51-
python3 -m pip install --upgrade pip && \
52-
pip3 install \
53-
numpy \
54-
scipy \
55-
sympy \
56-
parameterized && \
57-
# install MMG 5.5
58-
git clone -b 'v5.5.1' --depth 1 https://github.com/MmgTools/mmg /tmp/mmg_5_5_1 && \
13+
echo deb https://apt.repos.intel.com/oneapi all main > /etc/apt/sources.list.d/oneAPI.list
14+
15+
# Update again with the new ppa
16+
RUN add-apt-repository ppa:git-core/ppa && \
17+
apt-get -y update
18+
19+
# Install packages
20+
RUN apt-get install -y --no-install-recommends \
21+
sudo \
22+
build-essential \
23+
g++-12 \
24+
gfortran-12 \
25+
clang-14 \
26+
libomp-dev \
27+
cmake \
28+
gfortran \
29+
git \
30+
intel-oneapi-compiler-dpcpp-cpp \
31+
intel-oneapi-mkl-devel \
32+
libboost-dev \
33+
libhdf5-dev \
34+
libhdf5-openmpi-dev \
35+
libmetis-dev \
36+
libopenmpi-dev \
37+
libscotch-dev \
38+
libtrilinos-amesos-dev \
39+
libtrilinos-amesos2-dev \
40+
libtrilinos-aztecoo-dev \
41+
libtrilinos-epetra-dev \
42+
libtrilinos-epetraext-dev \
43+
libtrilinos-ifpack-dev \
44+
libtrilinos-ml-dev \
45+
libtrilinos-teuchos-dev \
46+
libtrilinos-tpetra-dev \
47+
libtrilinos-kokkos-dev \
48+
libtrilinos-kokkos-kernels-dev \
49+
libtrilinos-shylu-dev \
50+
libmedc-dev \
51+
openmpi-bin \
52+
python3-dev \
53+
python3-h5py \
54+
python3-pip
55+
56+
# Upgrade Pip
57+
RUN python3 -m pip install --upgrade pip
58+
59+
# Install Python packages
60+
RUN pip3 install numpy scipy sympy parameterized
61+
62+
# install MMG 5.5
63+
RUN git clone -b 'v5.5.1' --depth 1 https://github.com/MmgTools/mmg /tmp/mmg_5_5_1 && \
5964
mkdir /tmp/mmg_5_5_1/build && \
6065
mkdir -p /external_libraries/mmg/mmg_5_5_1 && \
6166
cd /tmp/mmg_5_5_1/build && \
6267
cmake .. -DCMAKE_RULE_MESSAGES=OFF -DCMAKE_C_FLAGS="-w" -DCMAKE_CXX_FLAGS="-w" -DCMAKE_INSTALL_PREFIX="/external_libraries/mmg/mmg_5_5_1" -DUSE_SCOTCH=OFF -DLIBMMG3D_SHARED=ON -DLIBMMG2D_SHARED=ON -DLIBMMGS_SHARED=ON -DLIBMMG_SHARED=ON && \
6368
make -j2 install && \
64-
cd / && \
65-
# install PARMMG
66-
git clone https://github.com/MmgTools/ParMmg /tmp/ParMmg_5ffc6ad && \
69+
cd /
70+
71+
# install PARMMG
72+
RUN git clone https://github.com/MmgTools/ParMmg /tmp/ParMmg_5ffc6ad && \
6773
mkdir /tmp/ParMmg_5ffc6ad/build && \
6874
mkdir -p /external_libraries/ParMmg_5ffc6ad && \
6975
cd /tmp/ParMmg_5ffc6ad/build && git checkout 5ffc6ada4afb1af50a43e1fa6f4c409cff2ea25c && \
7076
cmake .. -DCMAKE_RULE_MESSAGES=OFF -DCMAKE_C_FLAGS="-w" -DCMAKE_CXX_FLAGS="-w" -DCMAKE_INSTALL_PREFIX="/external_libraries/ParMmg_5ffc6ad" -DUSE_SCOTCH=OFF -DLIBPARMMG_SHARED=ON -DDOWNLOAD_MMG=OFF -DMMG_DIR="/tmp/mmg_5_5_1" -DMMG_BUILDDIR="/tmp/mmg_5_5_1/build" -DDOWNLOAD_METIS=OFF -DMETIS_DIR="/usr/include" && \
7177
make -j2 install && \
7278
rm -r /tmp/mmg_5_5_1 && \
7379
rm -r /tmp/ParMmg_5ffc6ad && \
74-
cd / && \
75-
# remove some now unnecessary packages
76-
apt-get -y remove \
80+
cd /
81+
82+
# Install Boost (form zip)
83+
RUN mkdir -p /workspace/boost && \
84+
wget -P /workspace/boost https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz && \
85+
tar -C /workspace/boost -xzf /workspace/boost/boost_1_87_0.tar.gz && \
86+
rm /workspace/boost/boost_1_87_0.tar.gz
87+
88+
# Remove unnecessary packages
89+
RUN apt-get -y remove \
7790
gnupg2 \
7891
software-properties-common \
7992
wget && \

scripts/docker_files/docker_file_ci_ubuntu_bionic/DockerFile

Lines changed: 0 additions & 61 deletions
This file was deleted.

scripts/docker_files/docker_file_kratos_ubuntu_bionic/DockerFile

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)