Merge pull request #333 from openworm/development

Remove JNML_HOME; test pulling image from dockerhub

Author: pgleeson

.github/workflows/docker-image-quickrun.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build the Docker image
       run: |
         chmod a+w output/

.github/workflows/docker-image.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build the Docker image
       run: |
         chmod a+w output/

.github/workflows/docker-pull.yml

@@ -0,0 +1,43 @@
+name: Docker Pull Test
+
+on:
+  push:
+    branches: [ master, dev* ]
+  pull_request:
+    branches: [ master, dev* ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Run the Docker image
+      run: |
+        # Don't build. Will be pulled when run below
+        ./run.sh
+
+    - name: Info on Docker images
+      run: |
+        docker -v
+        docker images
+
+    - name: Run the Docker image - no c302
+      run: |
+        # Shouldn't need to pull again.
+        ./stop.sh
+        ./run-quick.sh
+
+    - name: Info on Docker images
+      run: |
+        docker -v
+        docker images
+        
+    - name: Info on generated files
+      run: |
+        ls -alt
+        ls -alt output
+        ls -alt output/*

Dockerfile

@@ -90,9 +90,6 @@ RUN git clone https://github.com/openworm/sibernetic.git && \
 ################################################################################
 ########     Set some paths//environment variables
 
-ENV JNML_HOME=$HOME/jNeuroML
-ENV PATH=$PATH:$JNML_HOME
-
 ENV C302_HOME=$HOME/c302/c302
 ENV SIBERNETIC_HOME=$HOME/sibernetic
 ENV PYTHONPATH=$PYTHONPATH:$HOME/c302:$SIBERNETIC_HOME