Use graylog.conf.example from the release artifact used in image creation as the base config, with Docker-specific environment variable defaults, unless the old or custom graylog.conf exists at the old path. Previously, there was a separate (out of sync) copy kept in graylog2/graylog-docker that had some Docker-specific modifications (now set via the aforementioned env vars).
Use the Graylog Server-provided log4j2.xml, unless the old or custom log4j2.xml exists at the old path. Previously, there was a separate (out of sync) copy kept in graylog2/graylog-docker.
Closes #220.
Notes for Reviewers
[ ] The commit history must be preserved - please use the rebase-merge or standard merge option instead of squash-merge
This PR makes the images:
graylog.conf.example
from the release artifact used in image creation as the base config, with Docker-specific environment variable defaults, unless the old or customgraylog.conf
exists at the old path. Previously, there was a separate (out of sync) copy kept in graylog2/graylog-docker that had some Docker-specific modifications (now set via the aforementioned env vars).log4j2.xml
, unless the old or customlog4j2.xml
exists at the old path. Previously, there was a separate (out of sync) copy kept in graylog2/graylog-docker.Closes #220.
Notes for Reviewers