Skip to content

Get ready for building service config into serverless docker image #719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiwzhang merged 4 commits into from
Oct 22, 2019
Merged

Get ready for building service config into serverless docker image #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41bf343
add service config to docker image
qiwzhang Oct 8, 2019
f483491
make ENDPOINTS_SERVICE_NAME optional
qiwzhang Oct 8, 2019
74e9eb6
change Dockerfile with config
qiwzhang Oct 22, 2019
b9c03eb
use COPY instead of ADD
qiwzhang Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions docker/serverless/Dockerfile.with_config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Serverless ESP docker image with build-in service config
FROM _SERVERLESS_IMAGE

ENV ENDPOINTS_SERVICE_PATH /etc/nginx/service.json
COPY service.json ${ENDPOINTS_SERVICE_PATH}
Copy link
Copy Markdown
Contributor

@JLXIA JLXIA Oct 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, where this service.json is generated?

Copy link
Copy Markdown
Contributor Author

@qiwzhang qiwzhang Oct 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. I will have a separate PR to submit a shell script to use "gcloud" cli to download it and build the image.


ENTRYPOINT ["/env-start-esp.py"]
26 changes: 17 additions & 9 deletions docker/serverless/env-start-esp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,29 @@ def main():
assert_env_var("PORT")
ARGS.append("--http_port={}".format(os.environ["PORT"]))

try:
assert_env_var("ENDPOINTS_SERVICE_NAME")
except KeyError as error:
serve_error_msg(error.message)
ARGS.append("--service={}".format(os.environ["ENDPOINTS_SERVICE_NAME"]))

if "ENDPOINTS_SERVICE_VERSION" in os.environ:
if "ENDPOINTS_SERVICE_PATH" in os.environ:
ARGS.extend(
[
"--rollout_strategy=fixed",
"--version={}".format(os.environ["ENDPOINTS_SERVICE_VERSION"]),
"--service_json_path={}".format(os.environ["ENDPOINTS_SERVICE_PATH"]),
]
)
else:
ARGS.append("--rollout_strategy=managed")
try:
assert_env_var("ENDPOINTS_SERVICE_NAME")
except KeyError as error:
serve_error_msg(error.message)
ARGS.append("--service={}".format(os.environ["ENDPOINTS_SERVICE_NAME"]))

if "ENDPOINTS_SERVICE_VERSION" in os.environ:
ARGS.extend(
[
"--rollout_strategy=fixed",
"--version={}".format(os.environ["ENDPOINTS_SERVICE_VERSION"]),
]
)
else:
ARGS.append("--rollout_strategy=managed")

if "CORS_PRESET" in os.environ:
ARGS.append("--cors_preset={}".format(os.environ["CORS_PRESET"]))
Expand Down
2 changes: 0 additions & 2 deletions start_esp/start_esp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,8 +968,6 @@ def enforce_conflict_args(args):
return "Flag --enable_backend_routing cannot be used together with --service_control_url_override."
if args.metadata != METADATA_ADDRESS:
return "Flag --enable_backend_routing cannot be used together with --metadata."
if args.service_json_path:
Comment thread
nareddyt marked this conversation as resolved.
return "Flag --enable_backend_routing cannot be used together with --service_json_path."
if args.worker_processes != DEFAULT_WORKER_PROCESSES:
return "Flag --enable_backend_routing cannot be used together with --worker_processes."
if args.rewrite:
Expand Down