use full ultralytics

ansible/roles/loadbalancer/templates/Caddyfile.j2

@@ -11,11 +11,18 @@
     basicauth {
         {{ pgadmin_basicauth_username }} {{ pgadmin_basicauth_password }}
     }
+    
     {% endif %}
 
     # Define the upstream servers (docker swarm nodes) for load balancing
     reverse_proxy {% for host in groups['swarm'] %}{{ hostvars[host]['internal_ip'] }}:{{ port }} {% endfor %} {
+
+        {% if site == 'pgadmin.sbtp.xyz' %}
+        health_uri /login
+        {% else %}
         health_uri /health
+        {% endif %}
+
         health_interval 10s
         health_timeout 5s
     }

requirements.txt

@@ -3,5 +3,4 @@ ggshield
 click
 ansible
 ansible-lint
-vcsi
+vcsi
-torrentfile

services/our/Dockerfile

@@ -1,5 +1,5 @@
 # Use ultralytics (YOLO) as base image
-FROM ultralytics/ultralytics:8.3.203-cpu AS base
+FROM ultralytics/ultralytics:8.3.203 AS base
 
 # prevent docker-clean apt rules from deleting our cache
 RUN rm -f /etc/apt/apt.conf.d/docker-clean

services/our/compose.production.yaml

@@ -67,16 +67,14 @@ services:
   pgadmin:
     image: dpage/pgadmin4:latest
     environment:
-      PGADMIN_LISTEN_ADDRESS: "0.0.0.0"
-      PGADMIN_LISTEN_PORT: 5050
       PGADMIN_DISABLE_POSTFIX: 1
     healthcheck:
-      test: ["CMD", "nc", "-z", "127.0.0.1", "5050"]
+      test: ["CMD", "nc", "-z", "127.0.0.1", "80"]
       interval: 5s
       retries: 3
       start_period: 60s
     ports:
-      - target: 5050
+      - target: 80
         published: 9095
         protocol: tcp
         mode: ingress

services/our/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "futureporn-our",
-	"version": "2.8.16",
+	"version": "2.8.31",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "futureporn-our",
-			"version": "2.8.16",
+			"version": "2.8.31",
 			"dependencies": {
 				"@aws-sdk/client-s3": "3.726.1",
 				"@aws-sdk/s3-request-presigner": "^3.844.0",
@@ -7061,15 +7061,6 @@
 			"integrity": "sha512-8Sld+DuyWRIftl86ZguJxR2oXCBccOiJxrY/Rj9/7ZBynW8pYMWzIcqxFL1da+25jaWJZVa+HHX/8SsA21JdTA==",
 			"license": "MIT"
 		},
-		"node_modules/fast-redact": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.5.0.tgz",
-			"integrity": "sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/fast-safe-stringify": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
@@ -9448,13 +9439,12 @@
 			"license": "MIT"
 		},
 		"node_modules/pino": {
-			"version": "9.7.0",
+			"version": "9.13.1",
-			"resolved": "https://registry.npmjs.org/pino/-/pino-9.7.0.tgz",
+			"resolved": "https://registry.npmjs.org/pino/-/pino-9.13.1.tgz",
-			"integrity": "sha512-vnMCM6xZTb1WDmLvtG2lE/2p+t9hDEIvTWJsu6FejkE62vB7gDhvzrpFR4Cw2to+9JNQxVnkAKVPA1KPB98vWg==",
+			"integrity": "sha512-Szuj+ViDTjKPQYiKumGmEn3frdl+ZPSdosHyt9SnUevFosOkMY2b7ipxlEctNKPmMD/VibeBI+ZcZCJK+4DPuw==",
 			"license": "MIT",
 			"dependencies": {
 				"atomic-sleep": "^1.0.0",
-				"fast-redact": "^3.1.1",
 				"on-exit-leak-free": "^2.1.0",
 				"pino-abstract-transport": "^2.0.0",
 				"pino-std-serializers": "^7.0.0",
@@ -9462,6 +9452,7 @@
 				"quick-format-unescaped": "^4.0.3",
 				"real-require": "^0.2.0",
 				"safe-stable-stringify": "^2.3.1",
+				"slow-redact": "^0.3.0",
 				"sonic-boom": "^4.0.1",
 				"thread-stream": "^3.0.0"
 			},
@@ -10413,6 +10404,12 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/slow-redact": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/slow-redact/-/slow-redact-0.3.2.tgz",
+			"integrity": "sha512-MseHyi2+E/hBRqdOi5COy6wZ7j7DxXRz9NkseavNYSvvWC06D8a5cidVZX3tcG5eCW3NIyVU4zT63hw0Q486jw==",
+			"license": "MIT"
+		},
 		"node_modules/slugify": {
 			"version": "1.6.6",
 			"resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz",
@@ -10871,9 +10868,9 @@
 			}
 		},
 		"node_modules/tar-fs": {
-			"version": "2.1.3",
+			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
-			"integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+			"integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
 			"license": "MIT",
 			"dependencies": {
 				"chownr": "^1.1.1",
@@ -10948,13 +10945,13 @@
 			"license": "MIT"
 		},
 		"node_modules/tinyglobby": {
-			"version": "0.2.14",
+			"version": "0.2.15",
-			"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+			"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-			"integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+			"integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
 			"license": "MIT",
 			"dependencies": {
-				"fdir": "^6.4.4",
+				"fdir": "^6.5.0",
-				"picomatch": "^4.0.2"
+				"picomatch": "^4.0.3"
 			},
 			"engines": {
 				"node": ">=12.0.0"
@@ -11506,9 +11503,9 @@
 			}
 		},
 		"node_modules/vite": {
-			"version": "7.1.3",
+			"version": "7.1.9",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-7.1.9.tgz",
-			"integrity": "sha512-OOUi5zjkDxYrKhTV3V7iKsoS37VUM7v40+HuwEmcrsf11Cdx9y3DIr2Px6liIcZFwt3XSRpQvFpL3WVy7ApkGw==",
+			"integrity": "sha512-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -11517,7 +11514,7 @@
 				"picomatch": "^4.0.3",
 				"postcss": "^8.5.6",
 				"rollup": "^4.43.0",
-				"tinyglobby": "^0.2.14"
+				"tinyglobby": "^0.2.15"
 			},
 			"bin": {
 				"vite": "bin/vite.js"