Merge pull request #3 from cmehay/dockerenv

Remove .dockerenv and .dockerinit if they exist

pyentrypoint/command.py

@@ -22,6 +22,14 @@ class Command(object):
             args='" "'.join(self.args)
         ))
 
+    def _rm_dockerenv(self):
+        """Delete '/.dockerenv' and '/.dockerinit' files"""
+        files = ['/.dockerenv', '/.dockerinit']
+        for f in files:
+            if os.path.isfile(f):
+                self.log.debug('Removing {file} file'.format(file=f))
+                os.unlink(f)
+
     def _clean_links_env(self):
         # TODO: that Looks too much complicated
         all_link_names = []
@@ -62,6 +70,7 @@ class Command(object):
     def run(self):
         if not self.is_handled:
             self._exec()
+        self._rm_dockerenv()
         if os.getuid() is 0:
             os.setgid(self.config.group)
             os.setuid(self.config.user)

setup.py

@@ -5,7 +5,7 @@ from setuptools import setup
 
 # Thanks Sam and Max
 
-__version__ = '0.3.6'
+__version__ = '0.3.7'
 
 if __name__ == '__main__':
     setup(

tests/pyentrypoint_test.py

@@ -202,6 +202,8 @@ def test_command():
             assert f.readline().startswith('OK')
         assert os.stat(test).st_uid == uid
         assert os.stat(test).st_gid == gid
+        assert not os.path.isfile('/.dockerenv')
+        assert not os.path.isfile('/.dockerinit')
 
 
 def test_config_file():