Skip to content

Commit e2047b9

Browse files
baagaard-usgsbaagaard-usgs
committed
DOCS: Update configurations. Match configs with Docker settings.
1 parent 89c13a1 commit e2047b9

File tree

11 files changed

+371
-286
lines changed

11 files changed

+371
-286
lines changed

‎Makefile.am‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,21 @@ EXTRA_DIST = \
3333
docker/README-developer \
3434
docker/builder.py \
3535
docker/centos-7 \
36-
docker/centos-8 \
36+
docker/rockylinux-8 \
3737
docker/debian-stable \
3838
docker/debian-testing \
39-
docker/fedora-33 \
40-
docker/fedora-34 \
39+
docker/fedora-35 \
40+
docker/fedora-36 \
41+
docker/fedora-37 \
4142
docker/ubuntu-18.04 \
4243
docker/ubuntu-20.04 \
43-
docker/ubuntu-21.04 \
44-
developer/developer-helper.py \
45-
developer/developer-helper.cfg \
44+
docker/ubuntu-22.04 \
45+
docker/ubuntu-22.10 \
4646
packager/build.py \
4747
packager/setup_macos.sh \
4848
packager/setup_linux.sh \
49-
packager/make_package.py \
50-
packager/make_petscdist.sh \
51-
packager/update_darwinlinking.py
49+
packager/build.py \
50+
packager/make_petscdist.sh
5251

5352

5453
dist_noinst_SCRIPTS = \

‎docker/centos-7‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@ ENV BUILD_ENV=${BUILD_ENV}
77

88
RUN yum install -y \
99
gcc \
10-
gcc-c++ \
11-
make \
10+
gcc-c++ \
11+
make \
1212
file \
13-
which \
14-
diffutils \
15-
gettext \
13+
which \
14+
diffutils \
15+
gettext \
1616
automake \
1717
autoconf \
1818
libtool \
1919
curl \
20-
libcurl-devel \
21-
openssh \
22-
libtiff \
23-
libtiff-devel \
20+
libcurl-devel \
21+
openssh \
22+
libtiff \
23+
libtiff-devel \
2424
zlib-devel \
25-
libffi-devel \
26-
unzip \
27-
bzip2 \
25+
libffi-devel \
26+
unzip \
27+
bzip2 \
2828
git \
29-
ca-certificates \
30-
lcov \
31-
gdb \
32-
valgrind \
33-
vim-common \
34-
vim-runtime
35-
29+
ca-certificates \
30+
lcov \
31+
gdb \
32+
valgrind \
33+
vim-common \
34+
vim-runtime
35+
3636

3737
# ------------------------------------------------------------------------------
3838
from os-update as build-certs-doi
@@ -48,58 +48,58 @@ ONBUILD ENV CERT_PATH=no CERT_FILE=no
4848
from build-${BUILD_ENV} as build-deps
4949

5050
ENV TEST_USER=pylith-tester \
51-
INSTALL_DIR=/opt/pylith \
52-
PYTHON_VERSION=3.9 \
53-
OMPI_MCA_btl_vader_single_copy_mechanism=none
51+
INSTALL_DIR=/opt/pylith \
52+
PYTHON_VERSION=3.10 \
53+
OMPI_MCA_btl_vader_single_copy_mechanism=none
5454

5555
# Create 'pylith-tester' user
5656
RUN useradd --create-home --shell /bin/bash $TEST_USER
5757
ENV HOME=/home/$TEST_USER
5858
ENV TOPSRC_DIR=${HOME}/src \
59-
TOPBUILD_DIR=${HOME}/build \
60-
PATH=${INSTALL_DIR}/bin:$PATH \
61-
LD_LIBRARY_PATH=$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$LD_LIBRARY_PATH \
62-
PYTHONPATH=${INSTALL_DIR}/lib/python${PYTHON_VERSION}/site-packages:${INSTALL_DIR}/lib64/python${PYTHON_VERSION}/site-packages:${PYTHONPATH} \
63-
HDF5_LIBDIR=${INSTALL_DIR}/lib \
64-
HDF5_INCDIR=${INSTALL_DIR}/include \
65-
OMPI_MCA_btl_vader_single_copy_mechanism=none
59+
TOPBUILD_DIR=${HOME}/build \
60+
PATH=${INSTALL_DIR}/bin:$PATH \
61+
LD_LIBRARY_PATH=$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$LD_LIBRARY_PATH \
62+
PYTHONPATH=${INSTALL_DIR}/lib/python${PYTHON_VERSION}/site-packages:${INSTALL_DIR}/lib64/python${PYTHON_VERSION}/site-packages:${PYTHONPATH} \
63+
HDF5_LIBDIR=${INSTALL_DIR}/lib \
64+
HDF5_INCDIR=${INSTALL_DIR}/include \
65+
OMPI_MCA_btl_vader_single_copy_mechanism=none
6666
RUN mkdir ${INSTALL_DIR} \
67-
&& chown ${TEST_USER} ${INSTALL_DIR} \
68-
&& chgrp ${TEST_USER} ${INSTALL_DIR}
67+
&& chown ${TEST_USER} ${INSTALL_DIR} \
68+
&& chgrp ${TEST_USER} ${INSTALL_DIR}
6969

7070
# ------------------------------------------------------------------------------
7171
USER ${TEST_USER}
7272
ENV src_dir=${TOPSRC_DIR}/pylith-installer build_dir=${TOPBUILD_DIR}/pylith-installer
7373
RUN mkdir -p ${TOPSRC_DIR} && \
74-
mkdir -p ${TOPBUILD_DIR} && \
75-
mkdir -p ${build_dir}
76-
74+
mkdir -p ${TOPBUILD_DIR} && \
75+
mkdir -p ${build_dir}
76+
7777
COPY --chown=pylith-tester:pylith-tester . ${src_dir}
7878

7979
WORKDIR ${src_dir}
8080
RUN autoreconf --install --verbose --force
8181

8282
WORKDIR ${build_dir}
8383
RUN ${src_dir}/configure --prefix=${INSTALL_DIR} --with-fetch=curl \
84-
--with-fortran=no --with-make-threads=`nproc` \
85-
--with-cert-path=${CERT_PATH} --with-cert-file=${CERT_FILE} \
86-
--enable-cmake \
87-
--disable-sqlite \
88-
--enable-gcc \
89-
--enable-openssl \
90-
--enable-mpi=openmpi \
91-
--enable-cppunit \
92-
--enable-python \
93-
--enable-pcre \
94-
--enable-swig \
95-
--enable-sqlite \
96-
--enable-proj \
97-
--enable-hdf5 \
98-
--enable-h5py \
99-
--enable-netcdf \
100-
--enable-netcdfpy \
101-
&& make -C dependencies \
102-
&& rm -r ${build_dir}
84+
--with-fortran=no --with-make-threads=`nproc` \
85+
--with-cert-path=${CERT_PATH} --with-cert-file=${CERT_FILE} \
86+
--enable-cmake \
87+
--disable-sqlite \
88+
--enable-gcc \
89+
--enable-openssl \
90+
--enable-mpi=openmpi \
91+
--enable-cppunit \
92+
--enable-python \
93+
--enable-pcre \
94+
--enable-swig \
95+
--enable-sqlite \
96+
--enable-proj \
97+
--enable-hdf5 \
98+
--enable-h5py \
99+
--enable-netcdf \
100+
--enable-netcdfpy \
101+
&& make -C dependencies \
102+
&& rm -r ${build_dir}
103103

104104

105105
WORKDIR $HOME

‎docker/rockylinux-8‎

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -19,93 +19,92 @@ from os-${BUILD_ENV} as os-update
1919

2020
RUN dnf install -y \
2121
gcc \
22-
gcc-c++ \
23-
redhat-rpm-config \
24-
make \
22+
gcc-c++ \
23+
redhat-rpm-config \
24+
make \
2525
file \
26-
which \
27-
diffutils \
26+
which \
27+
diffutils \
2828
automake \
2929
autoconf \
3030
libtool \
31-
curl \
32-
libcurl-devel \
33-
openssl \
34-
openssl-devel \
31+
curl \
32+
libcurl-devel \
33+
openssl \
34+
openssl-devel \
3535
zlib-devel \
36-
unzip \
36+
unzip \
3737
git \
38-
ca-certificates \
39-
python38 \
40-
python38-devel \
41-
python38-pip \
42-
mpich \
43-
mpich-devel \
44-
cmake \
45-
sqlite \
46-
sqlite-devel \
47-
libtiff \
48-
libtiff-devel \
49-
gdb \
50-
valgrind \
51-
vim-common \
52-
vim-minimal \
53-
dnf-plugins-core
38+
ca-certificates \
39+
python38 \
40+
python38-devel \
41+
python38-pip \
42+
mpich \
43+
mpich-devel \
44+
cmake \
45+
sqlite \
46+
sqlite-devel \
47+
libtiff \
48+
libtiff-devel \
49+
gdb \
50+
valgrind \
51+
vim-common \
52+
vim-minimal \
53+
dnf-plugins-core
5454

5555
RUN dnf config-manager --set-enabled powertools && \
56-
dnf install -y cppunit cppunit-devel && \
57-
alternatives --set python3 /usr/bin/python3.8
58-
56+
dnf install -y cppunit cppunit-devel && \
57+
alternatives --set python3 /usr/bin/python3.8
58+
5959
# ------------------------------------------------------------------------------
6060
from os-update as build-deps
6161

6262
ENV TEST_USER=pylith-tester \
63-
INSTALL_DIR=/opt/pylith \
64-
PYTHON_VERSION=3.8
63+
INSTALL_DIR=/opt/pylith \
64+
PYTHON_VERSION=3.8
6565

6666
# Create 'pylith-tester' user
6767
RUN useradd --create-home --shell /bin/bash $TEST_USER
6868
ENV HOME=/home/$TEST_USER
6969
ENV TOPSRC_DIR=${HOME}/src \
70-
TOPBUILD_DIR=${HOME}/build \
71-
PATH=${INSTALL_DIR}/bin:/usr/lib64/mpich/bin:$PATH \
72-
LD_LIBRARY_PATH=$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$LD_LIBRARY_PATH \
73-
PYTHONPATH=${INSTALL_DIR}/lib/python${PYTHON_VERSION}/site-packages:${INSTALL_DIR}/lib64/python${PYTHON_VERSION}/site-packages:${PYTHONPATH} \
74-
HDF5_LIBDIR=${INSTALL_DIR}/lib \
75-
HDF5_INCDIR=${INSTALL_DIR}/include
70+
TOPBUILD_DIR=${HOME}/build \
71+
PATH=${INSTALL_DIR}/bin:/usr/lib64/mpich/bin:$PATH \
72+
LD_LIBRARY_PATH=$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$LD_LIBRARY_PATH \
73+
PYTHONPATH=${INSTALL_DIR}/lib/python${PYTHON_VERSION}/site-packages:${INSTALL_DIR}/lib64/python${PYTHON_VERSION}/site-packages:${PYTHONPATH} \
74+
HDF5_LIBDIR=${INSTALL_DIR}/lib \
75+
HDF5_INCDIR=${INSTALL_DIR}/include
7676
RUN mkdir ${INSTALL_DIR} \
77-
&& chown ${TEST_USER} ${INSTALL_DIR} \
78-
&& chgrp ${TEST_USER} ${INSTALL_DIR}
77+
&& chown ${TEST_USER} ${INSTALL_DIR} \
78+
&& chgrp ${TEST_USER} ${INSTALL_DIR}
7979

8080
# ------------------------------------------------------------------------------
8181
USER ${TEST_USER}
8282
ENV src_dir=${TOPSRC_DIR}/pylith-installer build_dir=${TOPBUILD_DIR}/pylith-installer
8383
RUN mkdir -p ${TOPSRC_DIR} && \
84-
mkdir -p ${TOPBUILD_DIR} && \
85-
mkdir -p ${build_dir}
86-
84+
mkdir -p ${TOPBUILD_DIR} && \
85+
mkdir -p ${build_dir}
86+
8787
COPY --chown=pylith-tester:pylith-tester . ${src_dir}
8888

8989
WORKDIR ${src_dir}
9090
RUN autoreconf --install --verbose --force
9191

9292
WORKDIR ${build_dir}
9393
RUN ${src_dir}/configure --prefix=${INSTALL_DIR} --with-fetch=curl \
94-
--with-fortran=no --with-make-threads=`nproc` \
95-
--with-cert-path=${CERT_PATH} --with-cert-file=${CERT_FILE} \
96-
--disable-cmake \
97-
--disable-sqlite \
98-
--disable-cppunit \
99-
--enable-pcre \
100-
--enable-swig \
101-
--enable-proj \
102-
--enable-cftime \
103-
--enable-hdf5 \
104-
--enable-h5py \
105-
--enable-netcdf \
106-
--enable-netcdfpy \
107-
&& make -C dependencies \
108-
&& rm -r ${build_dir}
94+
--with-fortran=no --with-make-threads=`nproc` \
95+
--with-cert-path=${CERT_PATH} --with-cert-file=${CERT_FILE} \
96+
--disable-cmake \
97+
--disable-sqlite \
98+
--disable-cppunit \
99+
--enable-pcre \
100+
--enable-swig \
101+
--enable-proj \
102+
--enable-hdf5 \
103+
--enable-h5py \
104+
--enable-netcdf \
105+
--enable-netcdfpy \
106+
&& make -C dependencies \
107+
&& rm -r ${build_dir}
109108

110109

111110
WORKDIR $HOME

‎docker/ubuntu-18.04‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ RUN ${src_dir}/configure --prefix=${INSTALL_DIR} --with-fetch=curl \
9797
--with-cert-path=${CERT_PATH} --with-cert-file=${CERT_FILE} \
9898
--disable-mpi \
9999
--disable-cppunit \
100-
--enable-cmake \
101100
--disable-sqlite \
102101
--disable-hdf5 \
103102
--enable-python \
103+
--enable-cmake \
104104
--enable-h5py \
105105
--enable-pcre \
106106
--enable-swig \

‎docker/ubuntu-20.04‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ RUN ${src_dir}/configure --prefix=${INSTALL_DIR} --with-fetch=curl \
9494
--with-cert-path=${CERT_PATH} --with-cert-file=${CERT_FILE} \
9595
--disable-mpi \
9696
--disable-cppunit \
97-
--enable-cmake \
9897
--disable-sqlite \
9998
--disable-hdf5 \
10099
--disable-proj \
100+
--enable-cmake \
101101
--enable-h5py \
102102
--enable-netcdf \
103103
--enable-netcdfpy \

‎docs/Makefile.am‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ EXTRA_DIST = \
1717
developer/creating-binaries.md \
1818
devenv/index.md \
1919
devenv/configs.md \
20-
devenv/dev-helper.md \
21-
devenv/docker-devenv.md \
20+
devenv/docker/index.md \
21+
devenv/docker/setup.md \
22+
devenv/docker/run.md \
23+
devenv/docker/update.md \
2224
devenv/images/docker-attach-vscode.png \
2325
install/index.md \
2426
install/configure.md \

0 commit comments

Comments
 (0)