docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1004 from klj613/allow-equals-character-in-env-file 

makes it possible to have '=' in the env file
This commit is contained in:
Joffrey F 2016-04-27 16:27:28 -07:00
parent 237f5318f2 6eaf8ce721
commit 3c02fc4cc7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/utils/utils.py
View File

@ -845,7 +845,7 @@ def parse_env_file(env_file):
if line[0] == '#': if line[0] == '#':
continue continue
parse_line = line.strip().split('=') parse_line = line.strip().split('=', 1)
if len(parse_line) == 2: if len(parse_line) == 2:
k, v = parse_line k, v = parse_line
environment[k] = v environment[k] = v

8
tests/unit/utils_test.py
View File

@ -371,6 +371,14 @@ class ParseEnvFileTest(base.BaseTestCase):
{'USER': 'jdoe', 'PASS': 'secret'}) {'USER': 'jdoe', 'PASS': 'secret'})
os.unlink(env_file) os.unlink(env_file)
def test_parse_env_file_with_equals_character(self):
env_file = self.generate_tempfile(
file_content='USER=jdoe\nPASS=sec==ret')
get_parse_env_file = parse_env_file(env_file)
self.assertEqual(get_parse_env_file,
{'USER': 'jdoe', 'PASS': 'sec==ret'})
os.unlink(env_file)
def test_parse_env_file_commented_line(self): def test_parse_env_file_commented_line(self):
env_file = self.generate_tempfile( env_file = self.generate_tempfile(
file_content='USER=jdoe\n#PASS=secret') file_content='USER=jdoe\n#PASS=secret')