Merge branch 'spantaleev:master' into master

This commit is contained in:
Marko Weltzer 2022-02-09 15:04:10 +01:00 committed by GitHub
commit 3ad454e06d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -63,10 +63,10 @@
# We do this so that the signing key would get generated. # We do this so that the signing key would get generated.
# #
# This will also generate a default homeserver.yaml configuration file and a log configuration file. # This will also generate a default homeserver.yaml configuration file and a log configuration file.
# We don't care about those configuraiton files, as we replace them with our own anyway (see below). # We don't care about those configuration files, as we replace them with our own anyway (see below).
# #
# We don't use the `docker_container` module, because using it with `cap_drop` requires # We don't use the `docker_container` module, because using it with `cap_drop` requires
# a very recent version, which is not available for a lot of people yet. # a very recent docker-py version, which is not available for a lot of people yet.
- name: Generate initial Synapse config and signing key - name: Generate initial Synapse config and signing key
command: | command: |
docker run docker run