From ed924cc3acc3ad32b485c575890279988c55a7cb Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Thu, 1 Aug 2024 12:40:38 -0700
Subject: [PATCH] updated ftfy

---
 codeserver/docker-compose.yml | 13 +++++++++
 ntfy/README.md                | 24 ++++++++++++++++
 ntfy/docker-compose.yml       | 52 ++++++++++-------------------------
 ntfy/sample-extends.yml       |  7 +++++
 ntfy/sample.env               | 13 +++++++++
 5 files changed, 72 insertions(+), 37 deletions(-)
 create mode 100644 codeserver/docker-compose.yml
 create mode 100644 ntfy/README.md
 create mode 100644 ntfy/sample-extends.yml
 create mode 100644 ntfy/sample.env

diff --git a/codeserver/docker-compose.yml b/codeserver/docker-compose.yml
new file mode 100644
index 0000000..0f315b0
--- /dev/null
+++ b/codeserver/docker-compose.yml
@@ -0,0 +1,13 @@
+  vscode:
+    image: lscr.io/linuxserver/code-server:latest
+    restart: unless-stopped
+    volumes:
+      - "./:/data"
+      - "./data/vscode-config:/config"
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/Vancouver
+      - PASSWORD=CHANGEME
+      - DEFAULT_WORKSPACE=/data
+      - PROXY_DOMAIN='my.domain.com'
\ No newline at end of file
diff --git a/ntfy/README.md b/ntfy/README.md
new file mode 100644
index 0000000..649e7e8
--- /dev/null
+++ b/ntfy/README.md
@@ -0,0 +1,24 @@
+# ntfy
+
+Last Updated: Wed July 31, 2024 20:41:59 PDT
+
+## Overview
+
+* [Docker Hub](https://hub.docker.com/r/binwiederhier/ntfy)
+* [Project](https://ntfy.sh/)
+* [Docker Compose Example](https://github.com/binwiederhier/ntfy/blob/main/docker-compose.yml)
+
+Proxy Port: 80
+
+## Healthcheck
+
+You can add a healthcheck to docker compose like so:
+
+```yaml
+healthcheck: # optional: remember to adapt the host:port to your environment
+      test: ["CMD-SHELL", "wget -q --tries=1 https://yourdomain.com/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"]
+      interval: 60s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+```
diff --git a/ntfy/docker-compose.yml b/ntfy/docker-compose.yml
index ea593d4..f7e57c1 100644
--- a/ntfy/docker-compose.yml
+++ b/ntfy/docker-compose.yml
@@ -1,43 +1,21 @@
-version: "2.3"
-
-#####################################################################################################################################
-# NTFY
-#
-# Compose file: https://docs.ntfy.sh/install/#docker
-# Config: https://docs.ntfy.sh/config/
-# Ports: 80
-# ntfy user add your_name
-# ntfy user change-role your_name admin
-#
-# Example use:
-# read $MYPASS; curl -u nick:$MYPASS -d "Look ma, with auth" https://ntfy.nickyeoman.com/internal
-#####################################################################################################################################
+version: '3.8'
 
 services:
   ntfy:
-    image: binwiederhier/ntfy
+    image: ${NTFY_IMAGE:-binwiederhier/ntfy}
+    restart: unless-stopped
     command:
       - serve
-    volumes:
-      - ./data/cache/ntfy:/var/cache/ntfy
-      - ./data/ntfy:/etc/ntfy
-      - ./data/ntfy-var:/var/lib/ntfy
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
     environment:
-      NTFY_BASE_URL: http://localhost
-      NTFY_CACHE_FILE: /var/lib/ntfy/cache.db
-      NTFY_AUTH_FILE: /var/lib/ntfy/auth.db
-      NTFY_AUTH_DEFAULT_ACCESS: deny-all
-      NTFY_BEHIND_PROXY: "true"
-      NTFY_ATTACHMENT_CACHE_DIR: /var/lib/ntfy/attachments
-      NTFY_ENABLE_LOGIN: "true"
-    healthcheck: # optional: remember to adapt the host:port to your environment
-      test: ["CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"]
-      interval: 60s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
-    ports:
-      - 80:80
-    restart: unless-stopped
\ No newline at end of file
+      - NTFY_BASE_URL=${NTFY_BASE_URL:-http://localhost}
+      - NTFY_CACHE_FILE=${NTFY_CACHE_FILE:-/var/lib/ntfy/cache.db}
+      - NTFY_AUTH_FILE=${NTFY_AUTH_FILE:-/var/lib/ntfy/auth.db}
+      - NTFY_AUTH_DEFAULT_ACCESS=${NTFY_AUTH_DEFAULT_ACCESS:-deny-all}
+      - NTFY_BEHIND_PROXY="${NTFY_BEHIND_PROXY:-true}"
+      - NTFY_ATTACHMENT_CACHE_DIR=${NTFY_ATTACHMENT_CACHE_DIR:-/var/lib/ntfy/attachments}
+      - NTFY_ENABLE_LOGIN="${NTFY_ENABLE_LOGIN:-true}"
+      - TZ=${NTFY_TZ:-UTC}
+    volumes:
+      - ${VOL_PATH:-./data}/ntfy-cache/ntfy:/var/cache/ntfy
+      - ${VOL_PATH:-./data}/ntfy:/etc/ntfy
+      - ${VOL_PATH:-./data}/ntfy-var:/var/lib/ntfy
diff --git a/ntfy/sample-extends.yml b/ntfy/sample-extends.yml
new file mode 100644
index 0000000..c11c814
--- /dev/null
+++ b/ntfy/sample-extends.yml
@@ -0,0 +1,7 @@
+version: '3.4'
+
+services:
+  ntfy:
+    extends:
+      file: ${COOKBOOK}/ntfy/docker-compose.yml
+      service: ntfy
diff --git a/ntfy/sample.env b/ntfy/sample.env
new file mode 100644
index 0000000..439fedc
--- /dev/null
+++ b/ntfy/sample.env
@@ -0,0 +1,13 @@
+
+COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
+VOL_PATH=./data
+# ntfy
+NTFY_IMAGE=binwiederhier/ntfy
+NTFY_BASE_URL=http://localhost
+NTFY_CACHE_FILE=/var/lib/ntfy/cache.db
+NTFY_AUTH_FILE=/var/lib/ntfy/auth.db
+NTFY_AUTH_DEFAULT_ACCESS=-deny-all
+NTFY_BEHIND_PROXY="true"
+NTFY_ATTACHMENT_CACHE_DIR=/var/lib/ntfy/attachments
+NTFY_ENABLE_LOGIN="true"
+NTFY_TZ=UTC
\ No newline at end of file