Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix mounting of homeserver.yaml when it does not exist on host #6913

Merged
merged 1 commit into from
Feb 29, 2020
Merged

Fix mounting of homeserver.yaml when it does not exist on host #6913

merged 1 commit into from
Feb 29, 2020

Conversation

SuperSandro2000
Copy link
Contributor

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
  • Pull request includes a sign off
  • Code style is correct (run the linters)

Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

it would be nice if your PR could say what you are trying to fix here, rather than just "update".

contrib/docker/docker-compose.yml Show resolved Hide resolved
contrib/docker/docker-compose.yml Outdated Show resolved Hide resolved
@richvdh richvdh self-assigned this Feb 14, 2020
Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
@SuperSandro2000 SuperSandro2000 changed the title Update docker-compose example under contrib Fix mounting of homeserver.yaml when it does not exist on host Feb 21, 2020
@SuperSandro2000
Copy link
Contributor Author

I dropped the redundant patch and fixed the mount point by dropping it as we already have one on /data.

Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

I'm still a bit confused about what exactly we're trying to fix here. The subject says "Fix mounting of homeserver.yaml when it does not exist on host", but you can't run synapse without a config file, so this doesn't seem to make any sense?

@SuperSandro2000
Copy link
Contributor Author

If you run docker-compose run --rm -e SYNAPSE_SERVER_NAME=my.matrix.host -e SYNAPSE_REPORT_STATS=yes synapse generate in contrib/docker and comment the duplicate traefik labels out you get:

tree -d
.
├── files
├── matrix-config
│   └── homeserver.yaml
└── schemas [error opening dir]

\ls matrix-config/ -l
total 4
drwxr-xr-x 2 root root 4096 Feb 27 15:44 homeserver.yaml

As you can see the homeserver.yaml is a directory and not a file cause the file did not exist when the container started to create it.

@richvdh
Copy link
Member

richvdh commented Feb 29, 2020

right, you didn't mention that you were trying to use generate. seems sensible to me then.

Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

looks good.

Normally I'd request a changelog entry but since it's a relatively trivial change to a contrib example, I'm happy to skip it here.

@richvdh richvdh merged commit d96ac97 into matrix-org:develop Feb 29, 2020
@SuperSandro2000 SuperSandro2000 deleted the fix-docker-compose branch March 1, 2020 02:02
phil-flex pushed a commit to phil-flex/synapse that referenced this pull request Apr 15, 2020
…x-org#6913)

Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit 'd96ac97d2':
  Fix mounting of homeserver.yaml when it does not exist on host (#6913)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants