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 23103ef..c0e0b73 100644 --- a/lain_sdk/lain_yaml.py +++ b/lain_sdk/lain_yaml.py @@ -342,7 +342,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, build_args=[]) if name is None: diff --git a/lain_sdk/yaml/lain_user_config.py b/lain_sdk/yaml/lain_user_config.py index 5499126..6b4151e 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: @@ -25,6 +26,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): 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