From ee6188d10072e1399e7a2fd8c86fb8300d811910 Mon Sep 17 00:00:00 2001 From: RasHas Date: Thu, 31 Mar 2022 23:11:39 +0300 Subject: [PATCH 1/3] Update install docs Add docker-compose example --- docs/install.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/install.md b/docs/install.md index 94630d83..f7fd7607 100644 --- a/docs/install.md +++ b/docs/install.md @@ -187,6 +187,24 @@ docker run \ serve ``` +Using docker-compose: +``` +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 From 44b9358c600b66c4e9c922bb382b5e322fd280bc Mon Sep 17 00:00:00 2001 From: "Philipp C. Heckel" Date: Thu, 31 Mar 2022 18:16:56 -0400 Subject: [PATCH 2/3] Update install.md --- docs/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install.md b/docs/install.md index f7fd7607..04d69bb8 100644 --- a/docs/install.md +++ b/docs/install.md @@ -188,7 +188,7 @@ docker run \ ``` Using docker-compose: -``` +```yaml version: "2.1" services: From 611894fd05133dc2e32ca29a2fed73d5269f94ea Mon Sep 17 00:00:00 2001 From: Philipp Heckel Date: Fri, 1 Apr 2022 08:49:15 -0400 Subject: [PATCH 3/3] Release notes, add EXPOSE 80 to Dockerfile --- Dockerfile | 2 ++ docs/install.md | 1 - docs/releases.md | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) 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 04d69bb8..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. 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