diff --git a/Dockerfile b/Dockerfile index 8e789a7b..6916cabc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,6 @@ FROM alpine MAINTAINER Philipp C. Heckel COPY ntfy /usr/bin + +EXPOSE 80/tcp ENTRYPOINT ["ntfy"] diff --git a/docs/install.md b/docs/install.md index 94630d83..1f02fc33 100644 --- a/docs/install.md +++ b/docs/install.md @@ -152,7 +152,6 @@ cd ntfysh-bin makepkg -si ``` - ## Docker The [ntfy image](https://hub.docker.com/r/binwiederhier/ntfy) is available for amd64, armv7 and arm64. It should be pretty straight forward to use. @@ -187,6 +186,24 @@ docker run \ serve ``` +Using docker-compose: +```yaml +version: "2.1" + +services: + ntfy: + image: binwiederhier/ntfy + container_name: ntfy + command: + - serve + volumes: + - /var/cache/ntfy:/var/cache/ntfy + - /etc/ntfy:/etc/ntfy + ports: + - 80:80 + restart: unless-stopped +``` + Alternatively, you may wish to build a customized Docker image that can be run with fewer command-line arguments and without delivering the configuration file separately. ``` FROM binwiederhier/ntfy diff --git a/docs/releases.md b/docs/releases.md index 2cc9efbe..bd315feb 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -39,6 +39,17 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release * Many thanks to [@cmeis](https://github.com/cmeis), [@Fallenbagel](https://github.com/Fallenbagel), [@Joeharrison94](https://github.com/Joeharrison94), and [@rogeliodh](https://github.com/rogeliodh) for input on the new attachment logic, and for testing the release + +## ntfy server v1.20.0 (UNRELEASED) + +**Bugs:** + +* Added `EXPOSE 80/tcp` to Dockerfile to support auto-discovery in [Traefik](https://traefik.io/) ([#195](https://github.com/binwiederhier/ntfy/issues/195), thanks to [@RasHas](https://github.com/RasHas)) + +**Documentation:** + +* Added docker-compose example to [install instructions](install.md#docker) ([#194](https://github.com/binwiederhier/ntfy/pull/194), thanks to [@RasHas](https://github.com/RasHas)) + --> ## ntfy server v1.19.0