Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.9.5 #360

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-intel.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Docker Image Test Build - Intel drivers
name: Docker Image Build - Intel drivers

on:
push:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-quickrun.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Docker Image Test - quick
name: Docker Image Quick Run

on:
push:
Expand All @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Docker Image Test Build
name: Docker Image Build & Run

on:
push:
Expand All @@ -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: |
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN mkdir -p /etc/sudoers.d && \

ENV DEBIAN_FRONTEND noninteractive # TODO: change


################################################################################
######## Update/install essential libraries

Expand Down Expand Up @@ -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
Expand All @@ -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


################################################################################
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_intel
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


################################################################################
Expand Down
112 changes: 56 additions & 56 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.4
0.9.5
12 changes: 11 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -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" .
12 changes: 11 additions & 1 deletion rebuild.sh
Original file line number Diff line number Diff line change
@@ -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 .
Loading