mirror of
https://github.com/element-hq/synapse.git
synced 2025-03-31 03:45:13 +00:00
docker: use shebangs to invoke generated scripts
When generating scripts from templates, don't add a leading newline so that their shebangs may be handled correctly.
This commit is contained in:
parent
3c188231c7
commit
9180297022
3 changed files with 6 additions and 3 deletions
|
@ -65,4 +65,4 @@ FROM $FROM
|
|||
# Replace the healthcheck with one which checks *all* the workers. The script
|
||||
# is generated by configure_workers_and_start.py.
|
||||
HEALTHCHECK --start-period=5s --interval=15s --timeout=5s \
|
||||
CMD /bin/sh /healthcheck.sh
|
||||
CMD ["/healthcheck.sh"]
|
||||
|
|
|
@ -58,4 +58,4 @@ ENTRYPOINT ["/start_for_complement.sh"]
|
|||
|
||||
# Update the healthcheck to have a shorter check interval
|
||||
HEALTHCHECK --start-period=5s --interval=1s --timeout=1s \
|
||||
CMD /bin/sh /healthcheck.sh
|
||||
CMD ["/healthcheck.sh"]
|
||||
|
|
|
@ -376,9 +376,11 @@ def convert(src: str, dst: str, **template_vars: object) -> None:
|
|||
#
|
||||
# We use append mode in case the files have already been written to by something else
|
||||
# (for instance, as part of the instructions in a dockerfile).
|
||||
exists = os.path.isfile(dst)
|
||||
with open(dst, "a") as outfile:
|
||||
# In case the existing file doesn't end with a newline
|
||||
outfile.write("\n")
|
||||
if exists:
|
||||
outfile.write("\n")
|
||||
|
||||
outfile.write(rendered)
|
||||
|
||||
|
@ -998,6 +1000,7 @@ def generate_worker_files(
|
|||
"/healthcheck.sh",
|
||||
healthcheck_urls=healthcheck_urls,
|
||||
)
|
||||
os.chmod("/healthcheck.sh", 0o755)
|
||||
|
||||
# Ensure the logging directory exists
|
||||
log_dir = data_dir + "/logs"
|
||||
|
|
Loading…
Add table
Reference in a new issue