Require pybind 2.6 from environment for gmxapi Python package extension module.

[alexxy/gromacs.git] / python_packaging / docker / ci.dockerfile

diff --git a/python_packaging/docker/ci.dockerfile b/python_packaging/docker/ci.dockerfile
index 1751907f11f65a37d5240144822c33d0cf7f8702..f503a5b7131c99fc73ad85c0f73df4bfb88e8a70 100644 (file)
--- a/python_packaging/docker/ci.dockerfile
+++ b/python_packaging/docker/ci.dockerfile
@@ -12,23 +12,16 @@
 # Build from the GROMACS image at the current fork point. Tag with the feature
 # name or the current revision.
 #
-#    FORKPOINT=$(git show -s --pretty=format:"%h" `git merge-base gerrit_master HEAD`)
+#    FORKPOINT=$(git show -s --pretty=format:"%h" `git merge-base master HEAD`)
 #    REF=`git show -s --pretty=format:"%h"`
 #    # or
 #    REF="fr1"
 #    docker build -t gmxapi/ci-mpich:${REF} --build-arg REF=${FORKPOINT} -f ci.dockerfile ..
 #
 
-#
-# Use gromacs installation from gmxapi/gromacs image
-#
-
 ARG REF=latest
-FROM gmxapi/gromacs-mpich:$REF as gromacs
-# This intermediate is necessary because the COPY command does not support syntax like the following:
-#COPY --from=gmxapi/gromacs:$REF /usr/local/gromacs /usr/local/gromacs
 
-FROM gmxapi/gromacs-dependencies-mpich
+FROM gmxapi/gromacs-dependencies-mpich as python-base
 
 RUN apt-get update && \
     apt-get -yq --no-install-suggests --no-install-recommends install \
@@ -40,9 +33,6 @@ RUN apt-get update && \
 # TODO: Use non-system Python installations for explicit version coverage.
 # Consider pyenv for generic management of Python environment.
 
-ENV CMAKE_ROOT /usr/local/cmake
-ENV PATH $CMAKE_ROOT/bin:$PATH
-
 RUN groupadd -r testing && useradd -m -s /bin/bash -g testing testing
 
 USER testing
@@ -50,31 +40,38 @@ USER testing
 ENV VENV /home/testing/venv
 RUN python3 -m venv $VENV
 RUN . $VENV/bin/activate && \
-    pip install --no-cache-dir --upgrade pip setuptools
+    pip install --no-cache-dir --upgrade pip setuptools wheel
 
 ADD --chown=testing:testing requirements-*.txt /home/testing/gmxapi/
 
-RUN . $VENV/bin/activate && \
-    pip install --no-cache-dir -r /home/testing/gmxapi/requirements-test.txt
+#
+# Use gromacs installation from gmxapi/gromacs image
+#
+
+FROM gmxapi/gromacs-mpich:$REF as gromacs
+# This intermediate is necessary because the COPY command does not support syntax like the following:
+#COPY --from=gmxapi/gromacs:$REF /usr/local/gromacs /usr/local/gromacs
+
+FROM python-base
 
-COPY --from=gromacs $CMAKE_ROOT $CMAKE_ROOT
 COPY --from=gromacs /usr/local/gromacs /usr/local/gromacs
 
+RUN $VENV/bin/python -m pip install --upgrade pip setuptools wheel
+RUN $VENV/bin/python -m pip install --no-cache-dir --no-build-isolation -r /home/testing/gmxapi/requirements-test.txt
+
 ADD --chown=testing:testing src /home/testing/gmxapi/src
 ADD --chown=testing:testing src/gmxapi /home/testing/gmxapi/src/gmxapi
 
-# We use "--no-cache-dir" to reduce Docker image size. The other pip flags are
-# to eliminate network access and speed up the build, since we already know we
-# have installed the dependencies.
+# We use "--no-cache-dir" to reduce Docker image size.
 RUN . $VENV/bin/activate && \
     (cd $HOME/gmxapi/src && \
+     rm -rf build dist && \
      GMXTOOLCHAINDIR=/usr/local/gromacs/share/cmake/gromacs \
-      pip install --no-cache-dir --no-deps --no-index --no-build-isolation . \
+      pip install --no-cache-dir --verbose . \
     )
 
 ADD --chown=testing:testing src/test /home/testing/gmxapi/test
 ADD scripts /docker_entry_points
-ADD --chown=testing:testing test /home/testing/test
 
 ADD --chown=testing:testing sample_restraint /home/testing/sample_restraint
 
@@ -85,9 +82,11 @@ RUN . $VENV/bin/activate && \
      mkdir build && \
      cd build && \
      cmake .. \
+             -DPYTHON_EXECUTABLE=$VENV/bin/python \
              -DDOWNLOAD_GOOGLETEST=ON \
              -DGMXAPI_EXTENSION_DOWNLOAD_PYBIND=ON && \
      make -j4 && \
+     make tests && \
      make test && \
      make install \
     )