From ed28864458b9714f1fba0b6ae860869a5b01d3af Mon Sep 17 00:00:00 2001 From: XTao Date: Tue, 27 Dec 2016 16:53:05 +0800 Subject: [PATCH 1/2] Add stage key --- lain_sdk/yaml/lain_user_config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lain_sdk/yaml/lain_user_config.py b/lain_sdk/yaml/lain_user_config.py index 20cf88b..382d27b 100644 --- a/lain_sdk/yaml/lain_user_config.py +++ b/lain_sdk/yaml/lain_user_config.py @@ -15,6 +15,7 @@ LAIN_CONFIG_SSO_TOKEN_KEY = "sso_token" LAIN_CONFIG_SSO_REFRESH_TOKEN_KEY = "sso_refresh_token" LAIN_CONFIG_DOMAIN_KEY = "domain" +LAIN_CONFIG_STAGE_KEY = "stage" class LainUserConfig: @@ -23,6 +24,7 @@ class LainUserConfig: sso_token_key = LAIN_CONFIG_SSO_TOKEN_KEY sso_refresh_token_key = LAIN_CONFIG_SSO_REFRESH_TOKEN_KEY domain_key = LAIN_CONFIG_DOMAIN_KEY + stage_key = LAIN_CONFIG_STAGE_KEY @classmethod def get_config_from(cls, config_file): From 946002700d43b4435d3a1a2ac424505c23e24c93 Mon Sep 17 00:00:00 2001 From: XTao Date: Tue, 27 Dec 2016 21:57:50 +0800 Subject: [PATCH 2/2] Add lain_yaml_path to meta --- lain_release | 27 +++++++++++----------- lain_sdk/lain_yaml.py | 3 ++- lain_sdk/yaml/templates/meta_dockerfile.j2 | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lain_release b/lain_release index a265b56..57f8ce8 100644 --- a/lain_release +++ b/lain_release @@ -1,25 +1,26 @@ #!/usr/bin/env python -import os, sys +import os +import sys import optparse from lain_sdk.lain_yaml import LainYaml def main(): - parser = optparse.OptionParser() - parser.add_option('-H', '--docker-host', - help="used to set DOCKER_HOST env for this process " - "(e.g. tcp://127.0.0.1:8082, unix:///var/run/docker.sock") - parser.add_option('--yaml', - default=os.path.join(os.getcwd(), 'lain.yaml'), - help="path for lain.yaml, default is `pwd`") - options, args = parser.parse_args() + parser = optparse.OptionParser() + parser.add_option('-H', '--docker-host', + help="used to set DOCKER_HOST env for this process " + "(e.g. tcp://127.0.0.1:8082, unix:///var/run/docker.sock") + parser.add_option('--yaml', + default=os.path.join(os.getcwd(), 'lain.yaml'), + help="path for lain.yaml, default is `pwd`") + options, args = parser.parse_args() - if options.docker_host is not None: - os.putenv('DOCKER_HOST', options.docker_host) + if options.docker_host is not None: + os.putenv('DOCKER_HOST', options.docker_host) - LainYaml(options.yaml).build_release() + LainYaml(options.yaml).build_release() if __name__ == '__main__': - sys.exit(main()) + sys.exit(main()) diff --git a/lain_sdk/lain_yaml.py b/lain_sdk/lain_yaml.py index 07a1956..2675a0f 100644 --- a/lain_sdk/lain_yaml.py +++ b/lain_sdk/lain_yaml.py @@ -327,7 +327,8 @@ def build_meta(self): """ self._prepare_act() params = { - 'base': 'scratch' + 'base': 'scratch', + 'lain_yaml_path': p.basename(self.yaml_path), } name = self.img_builders['meta'](context=self.ctx, params=params) if name is None: diff --git a/lain_sdk/yaml/templates/meta_dockerfile.j2 b/lain_sdk/yaml/templates/meta_dockerfile.j2 index e22c3ac..6e020fa 100644 --- a/lain_sdk/yaml/templates/meta_dockerfile.j2 +++ b/lain_sdk/yaml/templates/meta_dockerfile.j2 @@ -1,3 +1,3 @@ FROM {{ base }} -COPY lain.yaml /lain.yaml +COPY {{ lain_yaml_path }} /lain.yaml