Skip to content
Merged
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The client here will eventually be released as "spython" (and eventually to
singularity on pypi), and the versions here will coincide with these releases.

## [master](https://github.com/singularityhub/singularity-cli/tree/master)
- Singularity does not support multistage builds (0.0.82)
- stream command should print to stdout given CalledProcessError (0.0.81)
- USER regular expression should check for USER at start of line (0.0.80)
- add singularity options parameters to send to singularity (0.0.79)
Expand Down
7 changes: 7 additions & 0 deletions docs/pages/recipes.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ Now we can answer what kind of things might you want to do:
- convert a Singularity Recipe to a Dockerfile
- read in a recipe of either type, and modify it before doing the above

**Important** Singularity does not support multistage builds defined within
a single file, so if your Dockerfile has lines like:

```
COPY --from=builder /build/usr/share/gdal/ /usr/share/gdal/
```
You should modify the Dockerfile first to remove them.

# Command Line Client

Expand Down
15 changes: 13 additions & 2 deletions spython/main/parse/parsers/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,10 @@ def _arg(self, line):

"""
line = self._setup("ARG", line)
bot.warning("ARG is not supported for Singularity! To get %s" % line[0])
bot.warning("in the container, on host export SINGULARITY_%s" % line[0])
bot.warning(
"ARG is not supported for Singularity! Add as ENV to the container or export"
" SINGULARITYENV_%s on the host." % line[0]
)

# Env Parser

Expand Down Expand Up @@ -216,6 +218,15 @@ def _copy(self, lines):
lines = self._setup("COPY", lines)

for line in lines:

# Singularity does not support multistage builds
if line.startswith("--from"):
bot.warning(
"Singularity does not support multistage builds, skipping COPY %s"
% line
)
continue

values = line.split(" ")
topath = values.pop()
for frompath in values:
Expand Down
2 changes: 1 addition & 1 deletion spython/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# with this file, You can obtain one at http://mozilla.org/MPL/2.0/.


__version__ = "0.0.81"
__version__ = "0.0.82"
AUTHOR = "Vanessa Sochat"
AUTHOR_EMAIL = "vsochat@stanford.edu"
NAME = "spython"
Expand Down