Skip to content

Commit

Permalink
Add bash to AllPairs v2 Docker image and push
Browse files Browse the repository at this point in the history
  • Loading branch information
agitter committed Jun 22, 2024
1 parent ca44de1 commit 084a855
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-spras.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
docker pull reedcompbio/pathlinker:v2
docker pull reedcompbio/meo:latest
docker pull reedcompbio/mincostflow:latest
docker pull reedcompbio/allpairs:latest
docker pull reedcompbio/allpairs:v2
docker pull reedcompbio/domino:latest
docker pull reedcompbio/py4cytoscape:v2
- name: Build Omics Integrator 1 Docker image
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
path: docker-wrappers/AllPairs/.
dockerfile: docker-wrappers/AllPairs/Dockerfile
repository: reedcompbio/allpairs
tags: latest
tags: v2
cache_froms: reedcompbio/allpairs:latest
push: false
- name: Build DOMINO Docker image
Expand Down
3 changes: 3 additions & 0 deletions docker-wrappers/AllPairs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# AllPairs wrapper
FROM python:3.9-alpine3.16

# bash is required for dsub in the All of Us cloud environment
RUN apk add --no-cache bash

WORKDIR /AllPairs

RUN pip install networkx==2.6.3
Expand Down
1 change: 1 addition & 0 deletions docker-wrappers/AllPairs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ The Docker wrapper can be tested with `pytest -k test_ap.py` from the root of th

## Versions:
- v1: Initial version. Copies source file from SPRAS repository.
- v2: Add bash, which is not available in Alpine Linux.
3 changes: 1 addition & 2 deletions spras/allpairs.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ def run(nodetypes=None, network=None, output_file=None, container_framework="doc

print('Running All Pairs Shortest Paths with arguments: {}'.format(' '.join(command)), flush=True)

container_suffix = "allpairs"

container_suffix = "allpairs:v2"
out = run_container(
container_framework,
container_suffix,
Expand Down

0 comments on commit 084a855

Please sign in to comment.