Fix bug where environment variable contain space.

[sandanilenko]

For example "ES_JAVA_OPTS=-Xms512m -Xmx512m"

[renskiy]

Don't you think this changes should be applied only to env Option?

[sandanilenko]

Bug was found where i used env and added condition when value is string type and containt space symbol. This condition true only for env option, so i don't added it.

[renskiy]

BTW, you can try following code snippet for your case:

from six.moves import shlex_quote

docker.Container(
    options={'env': 'ES_JAVA_OPTS=%s' % shlex_quote('-Xms512m -Xmx512m')},
)

[sandanilenko]

I need to use several environment variables and i use list of variables. If use shlex_quote I get next result --env=''"'"'ES_JAVA_OPTS'='-Xms512m -Xmx512m'"'"''

[renskiy]

If use shlex_quote I get next result --env=''"'"'ES_JAVA_OPTS'='-Xms512m -Xmx512m'"'"''

it's OK. so does escaping work :) But you need use shlex_quote only for env value, -Xms512m -Xmx512m in this case

[sandanilenko]

Yes, you are right. May be not need use my decision for all variants. Thanks.

[sandanilenko]

Don't work with list of env variables:

@tasks.infrastructure
def master():
    fab.env.master_env.extend([
        "bootstrap.memory_lock=true",
        'ES_JAVA_OPTS={}'.format(shlex_quote('-Xms512m -Xmx512m')),
    ])

    fab.env.update(
        roledefs={
            'web': ['bars@test-ip'],
        },
    )


elasticsearch = tasks.ImageBuildDockerTasks(
    build_path='./elasticsearch',
    service=docker.Container(
        name='elasticsearch',
        image='registry:5000/logging/elasticsearch:latest',
        options=dict(
            publish='9200:9200',
            network='web_bb_logging',
            volume=['esdata:/usr/share/elasticsearch/data', ],
            env=fab.env.master_env
            # ulimit='memlock=-1:-1'
        ),

    ),
    roles=['web']
)

generate docker run command

run: docker run --publish=9200:9200 --env=bootstrap.memory_lock=true --env='ES_JAVA_OPTS='"'"'-Xms512m -Xmx512m'"'"'' --volume=esdata:/usr/share/elasticsearch/data --net=web_bb_logging --name=elasticsearch --detach registry:5000/logging/elasticsearch:latest