Merge pull request #252 from kabilar/master

Fix Dockerfiles and add GitHub Actions job

.github/workflows/ci.yml

@@ -29,3 +29,19 @@ jobs:
       - name: Test with pytest
         run: |
           pytest
+  image-build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+        python-version: ["3.10", "3.9", "3.8"]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+      - name: Test CPU Docker image build
+        run: |
+          docker build -t neuronets/nobrainer:master-cpu -f docker/cpu.Dockerfile .
+      - name: Test GPU Docker image build
+        run: |
+          docker build -t neuronets/nobrainer:master-gpu -f docker/gpu.Dockerfile .

docker/cpu.Dockerfile

@@ -1,4 +1,4 @@
-FROM tensorflow/tensorflow:2.10.0-jupyter
+FROM tensorflow/tensorflow:2.13.0-jupyter
 RUN curl -sSL http://neuro.debian.net/lists/focal.us-nh.full | tee /etc/apt/sources.list.d/neurodebian.sources.list \
   && export GNUPGHOME="$(mktemp -d)" \
   && echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf \
@@ -15,7 +15,7 @@ RUN git config --global user.email "[email protected]" \
     && git config --global user.name "Neuronets maintainers"
 RUN datalad clone https://github.com/neuronets/trained-models /models \
   && cd /models && git-annex enableremote osf-storage \
-  && datalad get -r .
+  && datalad get -s osf-storage .
 ENV LC_ALL=C.UTF-8 \
     LANG=C.UTF-8
 WORKDIR "/work"

docker/gpu.Dockerfile

@@ -1,4 +1,4 @@
-FROM tensorflow/tensorflow:2.10.0-gpu-jupyter
+FROM tensorflow/tensorflow:2.13.0-gpu-jupyter
 RUN curl -sSL http://neuro.debian.net/lists/focal.us-nh.full | tee /etc/apt/sources.list.d/neurodebian.sources.list \
   && export GNUPGHOME="$(mktemp -d)" \
   && echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf \
@@ -8,14 +8,13 @@ RUN curl -sSL http://neuro.debian.net/lists/focal.us-nh.full | tee /etc/apt/sour
   && apt-get install -y git-annex-standalone git \
   && rm -rf /tmp/*
 COPY [".", "/opt/nobrainer"]
-RUN cd /opt/nobrainer \
-    && sed -i 's/tensorflow >=/tensorflow-gpu >=/g' setup.cfg
+RUN cd /opt/nobrainer
 RUN python3 -m pip install --no-cache-dir /opt/nobrainer datalad datalad-osf
 RUN git config --global user.email "[email protected]" \
     && git config --global user.name "Neuronets maintainers"
 RUN datalad clone https://github.com/neuronets/trained-models /models \
   && cd /models && git-annex enableremote osf-storage \
-  && datalad get -r .
+  && datalad get -s osf-storage .
 ENV LC_ALL=C.UTF-8 \
     LANG=C.UTF-8
 WORKDIR "/work"

setup.cfg

@@ -38,7 +38,7 @@ install_requires =
     numpy
     scikit-image
     tensorflow-probability >= 0.11.0
-    tensorflow >= 2.10.0
+    tensorflow >= 2.12.0
     tensorflow-addons >= 0.12.0
     psutil
 zip_safe = False