Add custom entrypoint to generate the configuration #86
Conversation
There was a problem hiding this comment.
Officially this image seems to promote bind mounting the Caddyfile config. That's how I've use it. But I can see where generating an config would be much more maintainable.
It appears this PR makes some breaking changes to how I and the readme suggest to use this container.
To maintain backwards compatibility maybe it's possible to append the config file /etc/Caddyfile to /etc/caddy/Caddyfile.
| @@ -0,0 +1,15 @@ | |||
| #!/bin/bash | |||
|
|
|||
| rm -f /etc/caddy/Caddyfile | |||
There was a problem hiding this comment.
How does this affect people using one of the recommended run commands (https://github.com/abiosoft/caddy-docker#using-local-caddyfile-and-sites-root)?
Looking this code over I would reason their config is just ignored. And an empty one generated instead.
Disabling an docker entrypoint command is somewhat awkward to do with the docker command. Perhaps an check could be added to see if the any of the env vars are present before rewriting the config.
There was a problem hiding this comment.
I have added a backward compatibility mode, enabled by default.
| @@ -26,12 +26,12 @@ RUN /usr/bin/caddy -version | |||
| RUN /usr/bin/caddy -plugins | |||
|
|
|||
| EXPOSE 80 443 2015 | |||
| VOLUME /root/.caddy /srv | |||
| VOLUME /root/.caddy /srv /etc/caddy | |||
There was a problem hiding this comment.
If the config is being auto generated, having it also stored in an docker volume seems somewhat counter-intuitive. Does this provide an advantage for larger installations?
There was a problem hiding this comment.
For me, a volume means read-write data, and the image itself should be read-only.
README.md
Outdated
|
|
||
| ```sh | ||
| CADDY_ENTRY0_HOSTNAME=foo.bar.baz | ||
| CADDY_ENTRY0_MODE=self_signed |
There was a problem hiding this comment.
Should this not read CADDY_ENTRY0_TLS_MODE?
| CMD ["--conf", "/etc/Caddyfile", "--log", "stdout"] | ||
|
|
||
| ENTRYPOINT ["/bin/bash", "/docker-entrypoint.sh"] | ||
| CMD ["/usr/bin/caddy", "--conf", "/etc/caddy/Caddyfile", "--log", "stdout"] |
There was a problem hiding this comment.
The readme.md has a few mentions where the main config is located in the container. But this change moves it.
The documentation should be updated to remain working with this change.
How would someone use the default config with this pull request?
|
Firstly, thanks for this and sorry this is coming a bit late. Thanks. |
|
I made a change to the entrypoint, to make the PR a non-breaking change. |
Having to rebuild an image only to include the configuration is not ideal. This PR adds an rudimentary way to create the Caddyfile.