Merge pull request #53 from PauloMigAlmeida/fix/containall

Fix bug causing start->options to be ignored when network was set to false

Author: vsoch

.circleci/config.yml

@@ -42,6 +42,7 @@ test_scompose: &test_scompose
         pytest -sv scompose/tests/test_client.py
         pytest -sv scompose/tests/test_utils.py
         pytest -sv scompose/tests/test_command_args.py
+        pytest -sv scompose/tests/test_config.py
 
 install_dependencies: &install_dependencies
   name: Install Python dependencies

CHANGELOG.md

@@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
 The versions coincide with releases on pypi.
 
 ## [0.0.x](https://github.com/singularityhub/singularity-compose/tree/master) (0.0.x)
+ - fix a bug triggered when using startoptions in conjunction with network=false (0.0.15)
  - bind volumes can handle tilde expansion (0.0.14)
  - fix module import used by check command (0.0.13)
  - adding jsonschema validation and check command (0.0.12)

scompose/project/instance.py

@@ -193,7 +193,7 @@ def _get_network_commands(self, ip_address=None):
         """take a list of ports, return the list of --network-args to
         ensure they are bound correctly.
         """
-        ports = self.start_opts + ["--net"]
+        ports = ["--net"]
 
         # Fakeroot means not needing sudo
         fakeroot = "--fakeroot" in self.start_opts or "-f" in self.start_opts
@@ -546,6 +546,9 @@ def create(self, ip_address=None, sudo=False, writable_tmpfs=False):
             if self.network["enable"]:
                 options += self._get_network_commands(ip_address)
 
+            # Start options
+            options += self.start_opts
+
             # Hostname
             options += ["--hostname", self.name]
 

scompose/version.py

@@ -8,7 +8,7 @@
 
 """
 
-__version__ = "0.1.14"
+__version__ = "0.1.15"
 AUTHOR = "Vanessa Sochat"
 AUTHOR_EMAIL = "[email protected]"
 NAME = "singularity-compose"