Merge pull request #360 from openworm/development

Release 0.9.5

Author: pgleeson

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

@@ -1,4 +1,4 @@
-name: Docker Image Test Build - Intel drivers
+name: Docker Image Build - Intel drivers
 
 on:
   push:
@@ -18,7 +18,7 @@ jobs:
     - name: Build the Docker image
       run: |
         chmod a+w output/
-        ls -alt
+        ls -alth
         ./build_intel.sh
 
     - name: Info on Docker images

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

@@ -1,4 +1,4 @@
-name: Docker Image Test - quick
+name: Docker Image Quick Run
 
 on:
   push:
@@ -17,7 +17,7 @@ jobs:
     - name: Build the Docker image
       run: |
         chmod a+w output/
-        ls -alt
+        ls -alth
         ./build.sh
     - name: Info on Docker images
       run: |

.github/workflows/docker-image.yml

@@ -1,4 +1,4 @@
-name: Docker Image Test Build
+name: Docker Image Build and Run
 
 on:
   push:
@@ -17,7 +17,7 @@ jobs:
     - name: Build the Docker image
       run: |
         chmod a+w output/
-        ls -alt
+        ls -alth
         ./build.sh
     - name: Info on Docker images
       run: |

.github/workflows/docker-pull.yml

@@ -10,7 +10,7 @@ jobs:
 
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v4

Dockerfile

@@ -20,6 +20,7 @@ RUN mkdir -p /etc/sudoers.d && \
 
 ENV DEBIAN_FRONTEND noninteractive # TODO: change
 
+
 ################################################################################
 ########     Update/install essential libraries
 
@@ -52,15 +53,15 @@ RUN  sudo update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 10
 ################################################################################
 ########     Install NEURON simulator
 
-RUN pip3 install neuron==8.0.1
+RUN sudo pip3 install neuron==8.1.0
 
 
 ################################################################################
 ########     Install c302 for building neuronal network models
 
 RUN git clone https://github.com/openworm/c302.git && \
   cd c302 && \
-  git checkout ow-0.9.4 && \
+  git checkout ow-0.9.5 && \
   sudo pip install .
 
 # Note: pyNeuroML installed with the above library
@@ -74,7 +75,7 @@ RUN owm bundle remote --user add ow 'https://raw.githubusercontent.com/openworm/
 
 RUN git clone https://github.com/openworm/sibernetic.git && \
   cd sibernetic && \
-  git checkout ow-0.9.4  # fixed to a specific branch
+  git checkout ow-0.9.5  # fixed to a specific branch
 
 
 ################################################################################
@@ -117,7 +118,7 @@ RUN cd sibernetic && \
 COPY ./master_openworm.py $HOME/master_openworm.py
 RUN sudo chown $USER:$USER $HOME/master_openworm.py
 
-RUN echo '\n\nalias cd..="cd .."\nalias h=history\nalias ll="ls -alt"' >> ~/.bashrc
+RUN printf '\n\nalias cd..="cd .."\nalias h=history\nalias ll="ls -alt"\n' >> ~/.bashrc
 
 RUN pip list
 

Dockerfile_intel

@@ -61,7 +61,7 @@ RUN pip3 install neuron==8.0.1
 
 RUN git clone https://github.com/openworm/c302.git && \
   cd c302 && \
-  git checkout ow-0.9.4 && \
+  git checkout ow-0.9.5 && \
   sudo pip install .
 
 # Note: pyNeuroML installed with the above library
@@ -75,7 +75,7 @@ RUN owm bundle remote --user add ow 'https://raw.githubusercontent.com/openworm/
 
 RUN git clone https://github.com/openworm/sibernetic.git && \
   cd sibernetic && \
-  git checkout ow-0.9.4  # fixed to a specific branch
+  git checkout ow-0.9.5  # fixed to a specific branch
 
 
 ################################################################################

README.md

@@ -1 +1 @@
-0.9.4
+0.9.5

VERSION

@@ -1,4 +1,14 @@
 #!/bin/bash
 
 version=$(<VERSION) # Read version of Dockerfile from file VERSION
-docker build "$@" -t "openworm/openworm:$version" .
+
+# Set the platform flag if we're on ARM
+arch=$(uname -m)
+if [[ "$arch" == "arm64" || "$arch" == "aarch64" ]]; then
+    platform_flag="--platform linux/amd64"
+else
+    platform_flag=""
+fi
+
+# Build the Docker image
+docker build $platform_flag "$@" -t "openworm/openworm:$version" .

build.sh

@@ -1,4 +1,14 @@
 #!/bin/bash
 
 version=$(<VERSION) # Read version of Dockerfile from file VERSION
-docker build "$@" -t "openworm/openworm:$version"  --no-cache .
+
+# Set the platform flag if we're on ARM
+arch=$(uname -m)
+if [[ "$arch" == "arm64" || "$arch" == "aarch64" ]]; then
+    platform_flag="--platform linux/amd64"
+else
+    platform_flag=""
+fi
+
+# Rebuild the Docker image
+docker build $platform_flag "$@" -t "openworm/openworm:$version"  --no-cache .