Revive Docker container

nilsvu · nilsvu · commit 962f5766f1cc · 2022-06-27T20:14:57.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/.github/workflows/Tests.yaml b/.github/workflows/Tests.yaml
@@ -62,39 +62,39 @@ jobs:
       #   run: >
       #     gwrender.py waveform $GITHUB_WORKSPACE/Examples/Rainbow/Rainbow.yaml
       #     --time-merger 5064 --mass 150 -o ./ -v
-  # deploy-container:
-  #   name: Deploy container
-  #   needs: tests
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: docker/build-push-action@v1
-  #       with:
-  #         dockerfile: containers/Dockerfile
-  #         username: ${{ secrets.DOCKER_USERNAME }}
-  #         password: ${{ secrets.DOCKER_PASSWORD }}
-  #         repository: nilsleiffischer/gwpv
-  #         tag_with_ref: true
-  #         cache_froms: nilsleiffischer/gwpv:latest-dev,nilsleiffischer/gwpv:latest
-  #         always_pull: true
-  # examples:
-  #   name: Examples
-  #   needs: deploy-container
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     # Note that the container must run as the user `root` to be able to write
-  #     # to the $GITHUB_WORKSPACE directory:
-  #     # https://docs.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners#docker-container-filesystem
-  #     - name: Rainbow still
-  #       run: >
-  #         docker run -v $PWD:/out nilsleiffischer/gwpv:latest
-  #         scene Examples/Rainbow/Still.yaml -o /out/Still
-  #     - name: Rainbow movie
-  #       run: >
-  #         docker run -v $PWD:/out nilsleiffischer/gwpv:latest
-  #         scene Examples/Rainbow/Rainbow.yaml
-  #         --render-movie-to-file /out/Rainbow --num-jobs 2
-  #     - name: Rainbow scenes
-  #       run: >
-  #         docker run -v $PWD:/out nilsleiffischer/gwpv:latest
-  #         scenes Examples/Rainbow/Scenes.yaml -o /out/Scenes --num-jobs 2
+  deploy-container:
+    name: Deploy container
+    needs: tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/build-push-action@v1
+        with:
+          dockerfile: containers/Dockerfile
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: nilsleiffischer/gwpv
+          tag_with_ref: true
+          cache_froms: nilsleiffischer/gwpv:latest-dev,nilsleiffischer/gwpv:latest
+          always_pull: true
+  examples:
+    name: Examples
+    needs: deploy-container
+    runs-on: ubuntu-latest
+    steps:
+      # Note that the container must run as the user `root` to be able to write
+      # to the $GITHUB_WORKSPACE directory:
+      # https://docs.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners#docker-container-filesystem
+      - name: Rainbow still
+        run: >
+          docker run -v $PWD:/out nilsleiffischer/gwpv:latest
+          scene Examples/Rainbow/Still.yaml -o /out/Still
+      - name: Rainbow movie
+        run: >
+          docker run -v $PWD:/out nilsleiffischer/gwpv:latest
+          scene Examples/Rainbow/Rainbow.yaml
+          --render-movie-to-file /out/Rainbow --num-jobs 2
+      - name: Rainbow scenes
+        run: >
+          docker run -v $PWD:/out nilsleiffischer/gwpv:latest
+          scenes Examples/Rainbow/Scenes.yaml -o /out/Scenes --num-jobs 2
diff --git a/README.md b/README.md
@@ -52,10 +52,13 @@ to make your scene configuration files and data available in the container (see
 
 ### Option 2: Native environment
 
-1. Install [ParaView (v5.10 or above)](https://www.paraview.org/download/). Make
-   sure to install a version with Python 3.
+1. Install ParaView (v5.10 or above). You can
+   [download a pre-built binary](https://www.paraview.org/download/)
+   or use [Spack](https://spack.readthedocs.io/en/latest/) to configure a build
+   to your liking and compile it from source. Make sure to install ParaView with
+   support for Python 3.
 2. Create a [virtual environment](https://docs.python.org/3/tutorial/venv.html)
-   with ParaView's Python. With Python 3 you could do this:
+   with ParaView's Python. You could do this:
    ```sh
    path/to/python3 -m venv path/to/new/env
    ```
@@ -72,7 +75,7 @@ to make your scene configuration files and data available in the container (see
    `/Applications/ParaView-X.Y.Z.app/Contents/bin`. The Python executable
    determined by the script above may be named `vtkpython`, in which case you
    can look for the `python3` executable in the same directory or a `bin`
-   subdirectory. If you can't find ParaView's Python executable, try using any
+   subdirectory. If you can't find ParaView's Python executable, try using a
    Python installation with the same version as ParaView's.
 3. Give ParaView access to the environment. If you have created the environment
    with Python 3's `venv` then copy the `scripts/activate_this.py` script to the
diff --git a/containers/Dockerfile b/containers/Dockerfile
@@ -1,55 +1,42 @@
-FROM kitware/paraview:pv-v5.8.0-osmesa-py3 AS dev
+FROM ubuntu:latest AS dev
 USER root
 
-WORKDIR /root
-
-RUN apt-get update && apt-get install -y git wget ffmpeg
-
-# Install the same HDF5 version that Paraview uses so we can build h5py with it
-RUN apt-get update && apt-get install -y g++ \
-  && wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2 -O hdf5.tar.bz2 \
-  && tar jxf hdf5.tar.bz2 && rm hdf5.tar.bz2 && mv hdf5* hdf5 && cd hdf5 \
-  && ./configure --prefix=/opt/hdf5 && make -j && make install && cd .. \
-  && rm -r hdf5
-
-# Install pip
-RUN wget https://bootstrap.pypa.io/get-pip.py \
-  && python get-pip.py \
-  && rm get-pip.py
+ENV DEBIAN_FRONTEND=noninteractive
 
-# Create a Python environment so our manually-installed versions of the Python
-# packages take precedence over the ParaView-bundled versions.
-# By setting `VIRTUAL_ENV` and `PATH` we essentially activate the environment.
-ENV VIRTUAL_ENV /opt/envs/gwpv
-RUN apt-get update && apt-get install -y python3-venv \
-  && python -m venv $VIRTUAL_ENV
-COPY scripts/activate_this.py /opt/envs/gwpv/bin
-ENV PATH $VIRTUAL_ENV/bin:$PATH
-
-# Install h5py using the manually-installed HDF5.
-# Work around https://github.com/h5py/h5py/issues/1533 by installing from
-# master.
-RUN git clone https://github.com/h5py/h5py /opt/h5py && cd /opt/h5py \
-  && python setup.py configure --hdf5=/opt/hdf5 \
-  && python setup.py install && cd /root
-
-# Install remaining Python dependencies
-RUN pip install numpy scipy spherical_functions numba pyyaml tqdm astropy \
-  matplotlib requests
+WORKDIR /root
 
-# Make ParaView available in PATH
-ENV PATH /opt/paraview/bin:$PATH
+RUN apt-get -yqq update \
+ && apt-get -yqq upgrade \
+ && apt-get -yqq install --no-install-recommends \
+      curl \
+      ffmpeg \
+      git \
+      python3 \
+      python3-pip \
+      python-is-python3 \
+      wget \
+  && apt-get clean
+
+# Install ParaView
+RUN wget -O paraview.tar.gz --no-check-certificate "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v5.10&type=binary&os=Linux&downloadFile=ParaView-5.10.1-osmesa-MPI-Linux-Python3.9-x86_64.tar.gz" \
+  && tar -xzf paraview.tar.gz \
+  && rm paraview.tar.gz \
+  && mv ParaView-* /opt/paraview
+
+ENV PYTHONPATH="/usr/local/lib/python3.10/dist-packages:/opt/paraview/lib/python3.9/site-packages" \
+  PATH="/opt/paraview/bin:$PATH"
 
 # Provide the pre-installed application as another build stage
 FROM dev AS install
+WORKDIR /opt/gwpv
 COPY setup.py ./
 COPY README.md ./
 COPY gwpv ./gwpv
 COPY scripts/gwrender.py ./scripts/gwrender.py
 COPY paraview_plugins ./paraview_plugins
 COPY scene_overrides ./scene_overrides
 RUN pip install .
-WORKDIR /home/pv-user
+WORKDIR /root
 COPY Examples/ ./Examples
 
 # Provide access to the pre-installed application
