Skip to content

Commit 8338050

Browse files
author
Doug Greiman
committed
Fix style violations
1 parent bb138e6 commit 8338050

1 file changed

Lines changed: 13 additions & 9 deletions

File tree

scripts/gen_dockerfile.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def get_app_config(raw_config, base_image, config_file, source_dir):
8383
Args:
8484
raw_config (dict): deserialized app.yaml
8585
base_image (str): Docker image name to build on top of
86-
config_file (str): Path to user's app.yaml (might be <service-name>.yaml)
86+
config_file (str): Path to user's app.yaml (might be <service>.yaml)
8787
source_dir (str): Directory container user's source code
8888
8989
Returns:
@@ -95,7 +95,8 @@ def get_app_config(raw_config, base_image, config_file, source_dir):
9595
'Expected {} contents to be a Mapping type, but found type "{}"'.
9696
format(config_file, type(raw_config)))
9797

98-
entrypoint = validation_utils.get_field_value(raw_config, 'entrypoint', str)
98+
entrypoint = validation_utils.get_field_value(
99+
raw_config, 'entrypoint', str)
99100
if not PRINTABLE_REGEX.match(entrypoint):
100101
raise ValueError(
101102
'Invalid "entrypoint" value in app.yaml: {!r}'.format(entrypoint))
@@ -108,8 +109,10 @@ def get_app_config(raw_config, base_image, config_file, source_dir):
108109
if entrypoint and not entrypoint.startswith('exec '):
109110
entrypoint = 'exec ' + entrypoint
110111

111-
raw_runtime_config = validation_utils.get_field_value(raw_config, 'runtime_config', dict)
112-
python_version = validation_utils.get_field_value(raw_runtime_config, 'python_version', str)
112+
raw_runtime_config = validation_utils.get_field_value(
113+
raw_config, 'runtime_config', dict)
114+
python_version = validation_utils.get_field_value(
115+
raw_runtime_config, 'python_version', str)
113116

114117
dockerfile_python_version = PYTHON_INTERPRETER_VERSION_MAP.get(
115118
python_version)
@@ -164,8 +167,9 @@ def generate_files(app_config):
164167
optional_requirements_txt = ''
165168

166169
if app_config.entrypoint:
167-
optional_entrypoint = get_data('Dockerfile.entrypoint.template').format(
168-
entrypoint=app_config.entrypoint)
170+
optional_entrypoint = get_data(
171+
'Dockerfile.entrypoint.template').format(
172+
entrypoint=app_config.entrypoint)
169173
else:
170174
optional_entrypoint = ''
171175

@@ -176,8 +180,8 @@ def generate_files(app_config):
176180
python_version=app_config.dockerfile_python_version),
177181
optional_requirements_txt,
178182
get_data('Dockerfile.install_app'),
179-
optional_entrypoint ,
180-
])
183+
optional_entrypoint,
184+
])
181185

182186
return {
183187
'Dockerfile': dockerfile,
@@ -190,7 +194,7 @@ def generate_dockerfile_command(base_image, config_file, source_dir):
190194
191195
Args:
192196
base_image (str): Docker image name to build on top of
193-
config_file (str): Path to user's app.yaml (might be <service-name>.yaml)
197+
config_file (str): Path to user's app.yaml (might be <service>.yaml)
194198
source_dir (str): Directory container user's source code
195199
"""
196200
# Read yaml file. Does not currently support multiple services

0 commit comments

Comments
 (0)