From c3a76fe4e7bbfd60a0564514cc1c0a2c676b1f1c Mon Sep 17 00:00:00 2001
From: privlol <hello@priv.lol>
Date: Wed, 18 Dec 2024 15:29:00 -0500
Subject: [PATCH 1/2] Added nodebb service

---
 public/svgs/nodebb.svg        | 16 ++++++++++
 templates/compose/nodebb.yaml | 60 +++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 public/svgs/nodebb.svg
 create mode 100644 templates/compose/nodebb.yaml

diff --git a/public/svgs/nodebb.svg b/public/svgs/nodebb.svg
new file mode 100644
index 0000000000..cc1c56f881
--- /dev/null
+++ b/public/svgs/nodebb.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="321" height="75" viewBox="0 0 321 75">
+  <defs>
+    <radialGradient id="nodebb-a" cx="65.599%" cy="0%" r="169.036%" fx="65.599%" fy="0%" gradientTransform="matrix(-.5183 .5916 -.38031 -.80624 .996 -.388)">
+      <stop offset="0%" stop-color="#2A6CBE"/>
+      <stop offset="38.688%" stop-color="#2062BC"/>
+      <stop offset="49.182%" stop-color="#1F5FBC"/>
+      <stop offset="66.583%" stop-color="#1C5ABD"/>
+      <stop offset="85.354%" stop-color="#1956BC"/>
+      <stop offset="100%" stop-color="#1851BE"/>
+    </radialGradient>
+  </defs>
+  <g fill="none" transform="translate(1 1)">
+    <path fill="#000306" stroke="#000306" stroke-width=".275" d="M195.810017,20 C210.691849,20 221.256813,28.7272272 221.484017,45.845679 C221.490864,46.3615394 221.461776,47.1194739 221.396754,48.1194827 C221.328352,49.1714504 220.455158,49.9897119 219.400969,49.9897119 L179.110557,49.9897119 C179.110557,56.6336943 182.723978,64.2757202 196.378026,64.2757202 C204.088827,64.2757202 211.625406,61.928339 218.987763,57.2335766 L219.553745,56.8677968 C220.246813,56.4139645 221.17656,56.6079034 221.630392,57.3009716 C221.757029,57.4943637 221.837254,57.7144077 221.864806,57.943925 C222.131013,60.1615294 222.004084,61.5832211 221.484017,62.2089999 C220.452051,63.4507301 210.901843,73 196.378026,73 C180.58738,73 169,61.8765432 169,46.3909465 C169,31.3415638 180.019372,20 195.810017,20 Z M162.92733,0 C164.031899,-4.2495073e-16 164.92733,0.8954305 164.92733,2 L164.928075,44.1266361 C164.975781,44.8118124 165,45.5058194 165,46.2079256 C165,61.5334332 153.460581,73 138,73 C122.427386,73 111,61.5334332 111,46.2079256 C111,30.882418 122.427386,19.4158511 138,19.4158511 C144.981278,19.4158511 151.163029,21.7538895 155.843826,25.7295173 L155.843557,4.54188628 C155.843557,2.03347175 157.877029,4.60788274e-16 160.385444,0 L162.92733,0 Z M81,20 C96.4605809,20 108,31.3415638 108,46.5 C108,61.6584362 96.4605809,73 81,73 C65.4273859,73 54,61.6584362 54,46.5 C54,31.3415638 65.4273859,20 81,20 Z M27.324263,20 C41.6099773,20 50,29.1649049 50,41.7801268 L50,67.5 C50,69.4329966 48.4329966,71 46.5,71 L42.2494331,71 C41.1448636,71 40.2494331,70.1045695 40.2494331,69 L40.2494331,42.5348837 C40.2494331,34.3403805 35.8276644,28.6257928 26.3038549,28.6257928 C10.0816327,28.6257928 9.75718821,35.7795705 9.75069932,44.6831843 L9.75056689,71 L2,71 C0.8954305,71 1.3527075e-16,70.1045695 0,69 L0,35.2932975 L0,35.2932975 C0,24.3935718 19.1609977,20 27.324263,20 Z M81,28.7242798 C70.8049793,28.7242798 63.6348548,36.4670782 63.6348548,46.5 C63.6348548,56.3148148 70.8049793,64.2757202 81,64.2757202 C91.1950207,64.2757202 98.3651452,56.3148148 98.3651452,46.5 C98.3651452,36.4670782 91.1950207,28.7242798 81,28.7242798 Z M138,28.2362872 C127.804979,28.2362872 120.634855,36.0644241 120.634855,46.2079256 C120.634855,56.1309161 127.804979,64.179564 138,64.179564 C148.195021,64.179564 155.365145,56.1309161 155.365145,46.2079256 C155.365145,36.0644241 148.195021,28.2362872 138,28.2362872 Z M195.810017,28.7242798 C186.721876,28.7242798 180.473779,33.9588477 179.224159,41.8106996 L211.259858,41.8106996 C210.010238,33.9588477 204.443752,28.7242798 195.810017,28.7242798 Z"/>
+    <path fill="url(#nodebb-a)" d="M277,19 L276.999615,57.7303365 C276.99251,64.180962 276.88949,68.6242617 276.88949,73 L276.88949,73 L255.649055,73 C242.962262,73 236,67.06 236,57.7257143 C236,51.4771429 239.558488,46.9257143 245.1283,45.0742857 C240.564149,43.1457143 237.779243,38.8257143 237.779243,33.5028571 C237.779243,24.8628571 244.664149,19 256.732074,19 L256.732074,19 L277,19 Z M299.267926,19 C311.335851,19 318.220757,24.8628571 318.220757,33.5028571 C318.220757,38.8257143 315.435851,43.1457143 310.8717,45.0742857 C316.441512,46.9257143 320,51.4771429 320,57.7257143 C320,67.06 313.037738,73 300.350945,73 L279.11051,73 L279.11051,73 C279.11051,68.6242617 279.00749,64.180962 279.000385,57.7303365 L279,19 L299.267926,19 Z M266.092452,49.8571429 L256.499999,49.8571429 C250.156602,49.8571429 246.984904,52.2485714 246.984904,56.9542857 C246.984904,61.8914286 249.924527,64.36 255.726414,64.36 L255.726414,64.36 L260.754716,64.36 C264.777358,64.36 266.092452,62.4314286 266.092452,56.5685714 L266.092452,56.5685714 L266.092452,49.8571429 Z M299.500001,49.8571429 L289.907548,49.8571429 L289.907548,56.5685714 C289.907548,62.4314286 291.222642,64.36 295.245284,64.36 L300.273586,64.36 C306.075473,64.36 309.015096,61.8914286 309.015096,56.9542857 C309.015096,52.2485714 305.843398,49.8571429 299.500001,49.8571429 Z M266.169811,27.64 L257.350942,27.64 C251.703772,27.64 248.764149,30.1857143 248.764149,34.5057143 C248.764149,38.8257143 251.703772,41.3714286 257.350942,41.3714286 L257.350942,41.3714286 L266.169811,41.3714286 L266.169811,27.64 Z M298.649058,27.64 L289.830189,27.64 L289.830189,41.3714286 L298.649058,41.3714286 C304.296228,41.3714286 307.235851,38.8257143 307.235851,34.5057143 C307.235851,30.1857143 304.296228,27.64 298.649058,27.64 Z"/>
+  </g>
+</svg>
diff --git a/templates/compose/nodebb.yaml b/templates/compose/nodebb.yaml
new file mode 100644
index 0000000000..dba35ee6ba
--- /dev/null
+++ b/templates/compose/nodebb.yaml
@@ -0,0 +1,60 @@
+# ignore: false
+# documentation: https://docs.nodebb.org/
+# slogan: A next-generation discussion platform.
+# tags: communication, forums, discussion
+# logo: svgs/nodebb.svg
+# port: 4567
+
+services:
+  nodebb:
+    image: ghcr.io/nodebb/nodebb:latest
+    restart: unless-stopped
+    environment:
+      - SERVICE_FQDN_nodebb_4567
+    volumes:
+      - nodebb-build:/usr/src/app/build
+      - nodebb-uploads:/usr/src/app/public/uploads
+      - nodebb-config:/opt/config
+      - type: bind
+        source: ./.docker/config/setup.json
+        target: /usr/src/app/setup.json
+        isDirectory: false
+        content: |
+          {
+              "defaults": {
+                  "postgres": {
+                      "host": "postgres",
+                      "port": 5432,
+                      "database": "nodebb",
+                      "username": "nodebb",
+                      "password": "nodebb"
+                  }
+              }
+          }
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:4567"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+
+  postgres:
+    image: postgres:17.2-alpine
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: nodebb
+      POSTGRES_PASSWORD: nodebb
+      POSTGRES_DB: nodebb
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U nodebb", "-d", "nodebb" ]
+      interval: 5s
+      retries: 10
+      timeout: 2s
+
+volumes:
+  postgres-data:
+  nodebb-build:
+  nodebb-uploads:
+  nodebb-config:
\ No newline at end of file

From a8304ce34a4ca74440587798b7c9f6bff79fd326 Mon Sep 17 00:00:00 2001
From: PrivLol <hello@priv.lol>
Date: Sat, 21 Dec 2024 15:32:57 -0500
Subject: [PATCH 2/2] Fixed according to report

---
 templates/compose/nodebb.yaml | 44 +++++++++++++++--------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/templates/compose/nodebb.yaml b/templates/compose/nodebb.yaml
index dba35ee6ba..ba964c832a 100644
--- a/templates/compose/nodebb.yaml
+++ b/templates/compose/nodebb.yaml
@@ -1,4 +1,3 @@
-# ignore: false
 # documentation: https://docs.nodebb.org/
 # slogan: A next-generation discussion platform.
 # tags: communication, forums, discussion
@@ -10,27 +9,28 @@ services:
     image: ghcr.io/nodebb/nodebb:latest
     restart: unless-stopped
     environment:
-      - SERVICE_FQDN_nodebb_4567
+      - SERVICE_FQDN_NODEBB_4567
     volumes:
       - nodebb-build:/usr/src/app/build
       - nodebb-uploads:/usr/src/app/public/uploads
       - nodebb-config:/opt/config
-      - type: bind
-        source: ./.docker/config/setup.json
-        target: /usr/src/app/setup.json
-        isDirectory: false
-        content: |
-          {
-              "defaults": {
-                  "postgres": {
-                      "host": "postgres",
-                      "port": 5432,
-                      "database": "nodebb",
-                      "username": "nodebb",
-                      "password": "nodebb"
-                  }
+    command: >
+      /bin/bash -c "
+      cat > /usr/src/app/setup.json <<EOL
+      {
+          \"defaults\": {
+              \"postgres\": {
+                  \"host\": \"postgres\",
+                  \"port\": 5432,
+                  \"database\": \"nodebb\",
+                  \"username\": \"${SERVICE_USER_POSTGRES}\",
+                  \"password\": \"${SERVICE_PASSWORD_POSTGRES}\"
               }
           }
+      }
+      EOL
+      && tini -- entrypoint.sh
+      "
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:4567"]
       interval: 30s
@@ -42,8 +42,8 @@ services:
     image: postgres:17.2-alpine
     restart: unless-stopped
     environment:
-      POSTGRES_USER: nodebb
-      POSTGRES_PASSWORD: nodebb
+      POSTGRES_USER: ${SERVICE_USER_POSTGRES}
+      POSTGRES_PASSWORD: ${SERVICE_PASSWORD_POSTGRES}
       POSTGRES_DB: nodebb
     volumes:
       - postgres-data:/var/lib/postgresql/data
@@ -51,10 +51,4 @@ services:
       test: [ "CMD-SHELL", "pg_isready -U nodebb", "-d", "nodebb" ]
       interval: 5s
       retries: 10
-      timeout: 2s
-
-volumes:
-  postgres-data:
-  nodebb-build:
-  nodebb-uploads:
-  nodebb-config:
\ No newline at end of file
+      timeout: 2s
\ No newline at end of file