From 8c69234e285fdc5cae6772bde1f52bbbc2283c7d Mon Sep 17 00:00:00 2001 From: binwiederhier Date: Thu, 7 Mar 2024 16:59:42 -0500 Subject: [PATCH] Revert Docker user fix --- Dockerfile | 3 +-- Dockerfile-arm | 1 - Dockerfile-build | 3 +-- docs/integrations.md | 12 +++++++++--- docs/releases.md | 1 - 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 154a98ed..45dad05d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,7 @@ LABEL org.opencontainers.image.licenses="Apache-2.0, GPL-2.0" LABEL org.opencontainers.image.title="ntfy" LABEL org.opencontainers.image.description="Send push notifications to your phone or desktop using PUT/POST" -RUN apk add --no-cache tzdata \ - && adduser -D -u 1000 ntfy +RUN apk add --no-cache tzdata COPY ntfy /usr/bin EXPOSE 80/tcp diff --git a/Dockerfile-arm b/Dockerfile-arm index 05b56fb1..755092fd 100644 --- a/Dockerfile-arm +++ b/Dockerfile-arm @@ -12,7 +12,6 @@ LABEL org.opencontainers.image.description="Send push notifications to your phon # Alpine does not support adding "tzdata" on ARM anymore, see # https://github.com/binwiederhier/ntfy/issues/894 -RUN adduser -D -u 1000 ntfy COPY ntfy /usr/bin EXPOSE 80/tcp diff --git a/Dockerfile-build b/Dockerfile-build index f454284b..4530ec47 100644 --- a/Dockerfile-build +++ b/Dockerfile-build @@ -1,4 +1,4 @@ -FROM golang:1.21-bullseye as builder +FROM golang:1.22-bullseye as builder ARG VERSION=dev ARG COMMIT=unknown @@ -53,7 +53,6 @@ LABEL org.opencontainers.image.licenses="Apache-2.0, GPL-2.0" LABEL org.opencontainers.image.title="ntfy" LABEL org.opencontainers.image.description="Send push notifications to your phone or desktop using PUT/POST" -RUN adduser -D -u 1000 ntfy COPY --from=builder /app/dist/ntfy_linux_server/ntfy /usr/bin/ntfy EXPOSE 80/tcp diff --git a/docs/integrations.md b/docs/integrations.md index 2dc4487d..3f7e580b 100644 --- a/docs/integrations.md +++ b/docs/integrations.md @@ -6,6 +6,7 @@ I've added a ⭐ to projects or posts that have a significant following, or had ## Official integrations +- [changedetection.io](https://changedetection.io) ⭐ - Website change detection and notification - [Healthchecks.io](https://healthchecks.io/) ⭐ - Online service for monitoring regularly running tasks such as cron jobs - [Apprise](https://github.com/caronc/apprise/wiki/Notify_ntfy) ⭐ - Push notifications that work with just about every platform - [Uptime Kuma](https://uptime.kuma.pet/) ⭐ - A self-hosted monitoring tool @@ -16,7 +17,7 @@ I've added a ⭐ to projects or posts that have a significant following, or had - [Gatus](https://gatus.io/) ⭐ - Automated service health dashboard - [Automatisch](https://automatisch.io/) ⭐ - Open source Zapier alternative / workflow automation tool - [FlexGet](https://flexget.com/Plugins/Notifiers/ntfysh) ⭐ - Multipurpose automation tool for all of your media -- [Shoutrrr](https://containrrr.dev/shoutrrr/v0.7/services/ntfy/) ⭐ - Notification library for gophers and their furry friends. +- [Shoutrrr](https://containrrr.dev/shoutrrr/v0.8/services/ntfy/) ⭐ - Notification library for gophers and their furry friends. - [Netdata](https://learn.netdata.cloud/docs/alerts-and-notifications/notifications/agent-alert-notifications/ntfy) ⭐ - Real-time performance monitoring - [Deployer](https://github.com/deployphp/deployer) ⭐ - PHP deployment tool - [Scrt.link](https://scrt.link/) - Share a secret @@ -24,7 +25,7 @@ I've added a ⭐ to projects or posts that have a significant following, or had - [diun](https://crazymax.dev/diun/) - Docker Image Update Notifier - [Cloudron](https://www.cloudron.io/store/sh.ntfy.cloudronapp.html) - Platform that makes it easy to manage web apps on your server - [Xitoring](https://xitoring.com/docs/notifications/notification-roles/ntfy/) - Server and Uptime monitoring -- [changedetection.io](https://changedetection.io) ⭐ - Website change detection and notification +- [HetrixTools](https://docs.hetrixtools.com/ntfy-sh-notifications/) - Uptime monitoring ## Integration via HTTP/SMTP/etc. @@ -138,9 +139,15 @@ I've added a ⭐ to projects or posts that have a significant following, or had - [jetspotter](https://github.com/vvanouytsel/jetspotter) - send notifications when planes are spotted near you (Go) - [monitoring_ntfy](https://www.drupal.org/project/monitoring_ntfy) - Drupal monitoring Ntfy.sh integration (PHP/Drupal) - [Notify](https://flathub.org/apps/com.ranfdev.Notify) - Native GTK4 client for ntfy (Rust) +- [notify-via-ntfy](https://exchange.checkmk.com/p/notify-via-ntfy) - Checkmk plugin to send notifications via ntfy (Python) +- [ntfy-java](https://github.com/MaheshBabu11/ntfy-java/) - A Java package to interact with a ntfy server (Java) ## Blog + forum posts +- [Boost Your Productivity with ntfy.sh: The Ultimate Notification Tool for Command-Line Users](https://dev.to/archetypal/boost-your-productivity-with-ntfysh-the-ultimate-notification-tool-for-command-line-users-iil) - dev.to - 3/2024 +- [Introducing the Monitoring Ntfy.sh Integration Module: Real-time Notifications for Drupal Monitoring](https://cyberschorsch.dev/drupal/introducing-monitoring-ntfysh-integration-module-real-time-notifications-drupal-monitoring) - cyberschorsch.dev - 11/2023 +- [How to install Ntfy.sh on CasaOS using BigBearCasaOS](https://www.youtube.com/watch?v=wSWhtSNwTd8) - youtube.com - 10/2023 +- [Ntfy: Your Ultimate Push Notification Powerhouse!](https://kkamalesh117.medium.com/ntfy-your-ultimate-push-notification-powerhouse-1968c070f1d1) - kkamalesh117.medium.com - 9/2023 - [Installing Self Host NTFY On Linux Using Docker Container](https://www.pinoylinux.org/topicsplus/containers/installing-self-host-ntfy-on-linux-using-docker-container/) - pinoylinux.org - 9/2023 - [Homelab Notifications with ntfy](https://blog.alexsguardian.net/posts/2023/09/12/selfhosting-ntfy/) ⭐ - alexsguardian.net - 9/2023 - [Why NTFY is the Ultimate Push Notification Tool for Your Needs](https://osintph.medium.com/why-ntfy-is-the-ultimate-push-notification-tool-for-your-needs-e767421c84c5) - osintph.medium.com - 9/2023 @@ -226,7 +233,6 @@ I've added a ⭐ to projects or posts that have a significant following, or had - [Show HN: A tool to send push notifications to your phone, written in Go](https://news.ycombinator.com/item?id=29715464) ⭐ - news.ycombinator.com - 12/2021 - [Reddit selfhostable post](https://www.reddit.com/r/selfhosted/comments/qxlsm9/my_open_source_notification_android_app_and/) ⭐ - reddit.com - 11/2021 - ## Alternative ntfy servers Here's a list of public ntfy servers. As of right now, there is only one official server. The others are provided by the diff --git a/docs/releases.md b/docs/releases.md index 5d673032..9bdfef34 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -19,7 +19,6 @@ A small release after a long pause (lots of day job work). This release adds for **Bug fixes + maintenance:** * ⚠️ Remove `Rate-Topics` header due to DoS security issue if `visitor-subscriber-rate-limiting: true` ([#1048](https://github.com/binwiederhier/ntfy/issues/1048)) -* Add non-root user to Docker image, ntfy can be run as non-root ([#967](https://github.com/binwiederhier/ntfy/pull/967)/[#966](https://github.com/binwiederhier/ntfy/issues/966), thanks to [@arahja](https://github.com/arahja)) **Documentation:**