Skip to content

Commit

Permalink
Merge pull request #333 from openworm/development
Browse files Browse the repository at this point in the history
Remove JNML_HOME; test pulling image from dockerhub
  • Loading branch information
pgleeson authored Nov 16, 2023
2 parents 4d186f4 + a1fe2ff commit 86e7af4
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image-quickrun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/docker-pull.yml
Original file line number Diff line number Diff line change
@@ -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/*
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 86e7af4

Please sign in to comment.