Skip to content

Commit

Permalink
fix: fixed escaping of arguments to entrypoint of Docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
jonrkarr committed Dec 6, 2021
1 parent 1cf6ffc commit 17d099d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# VERSION
ARG VERSION=0.0.8
ARG VERSION=0.0.9
ARG SIMULATOR_VERSION="2021-10-05"

# Base OS
Expand Down Expand Up @@ -57,6 +57,8 @@ ENV VERBOSE=0 \
# - ugo+w permissions to `${OPENCORDIR}/python/bin` are needed because the OpenCOR Python pluging dynamically generates these files
RUN mkdir ${HOMEDIR}/Biosimulators_OpenCOR \
&& chmod -R ugo+w ${OPENCORDIR}/python/bin
ENV PATH=${OPENCORDIR}/python/bin:$PATH
WORKDIR ${HOMEDIR}/Biosimulators_OpenCOR
ENTRYPOINT ["pythonshell", "-m", "biosimulators_opencor"]
COPY scripts/biosimulators-opencor ${OPENCORDIR}/python/bin
ENTRYPOINT ["biosimulators-opencor"]
CMD []
2 changes: 1 addition & 1 deletion biosimulators_opencor/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from .core import exec_sedml_docs_in_combine_archive
from biosimulators_utils.simulator.cli import build_cli

App = build_cli('opencor', __version__,
App = build_cli('biosimulators-opencor', __version__,
'OpenCOR', get_simulator_version(), 'https://opencor.ws',
exec_sedml_docs_in_combine_archive)

Expand Down
2 changes: 1 addition & 1 deletion biosimulators_opencor/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.0.8'
__version__ = '0.0.9'
4 changes: 4 additions & 0 deletions scripts/biosimulators-opencor
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh

opencor_path=$(which OpenCOR)
"$(cd "$(dirname "$opencor_path")"; pwd)/bin/OpenCOR" -c PythonShell -m biosimulators_opencor "$@"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
],
entry_points={
'console_scripts': [
'biosimulators-opencor = biosimulators_opencor.__main__:main',
# 'biosimulators-opencor = biosimulators_opencor.__main__:main',
],
},
)

0 comments on commit 17d099d

Please sign in to comment.