Merge branch 'feature/project-restructure'

Author: Rykuno

.env.example

@@ -1,5 +1,15 @@
+# API
 ORIGIN=http://localhost:5173
 
 # Database
 DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres
-REDIS_URL=redis://localhost:6379
+
+# Redis
+REDIS_URL=redis://localhost:6379
+
+# Storage
+PUBLIC_IMAGE_URI=http://localhost:9000/dev
+STORAGE_BUCKET=dev
+STORAGE_URL=http://localhost:9000
+STORAGE_ACCESS_KEY=user
+STORAGE_SECRET_KEY=password

Dockerfile.minio

@@ -0,0 +1,3 @@
+FROM nginx:stable-alpine-slim
+COPY minio-console.conf.template /etc/nginx/templates/
+RUN rm /etc/nginx/conf.d/default.conf /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh

drizzle.config.ts

@@ -1,8 +1,8 @@
 import type { Config } from 'drizzle-kit';
 
 export default {
-	out: './src/lib/server/api/databases/migrations',
-	schema: './src/lib/server/api/databases/tables/*.table.ts',
+	out: './src/lib/server/api/databases/postgres/migrations',
+	schema: './src/lib/server/api/databases/postgres/tables/*.table.ts',
 	breakpoints: false,
 	strict: true,
 	dialect: 'postgresql',

minio-console.conf.template

@@ -0,0 +1,41 @@
+upstream minio_console {
+	server ${MINIO_HOST}:${MINIO_CONSOLE_PORT};
+}
+
+server {
+	listen ${PORT};
+
+	# Allow special characters in headers
+	ignore_invalid_headers off;
+	# Allow any size file to be uploaded.
+	# Set to a value such as 1000m; to restrict file size to a specific value
+	client_max_body_size 0;
+	# Disable buffering
+	proxy_buffering off;
+	proxy_request_buffering off;
+
+	location / {
+		proxy_set_header Host $http_host;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Proto $scheme;
+		proxy_set_header X-NginX-Proxy true;
+
+		# This is necessary to pass the correct IP to be hashed
+		real_ip_header X-Real-IP;
+
+		proxy_connect_timeout 300;
+
+		# To support websockets in MinIO versions released after January 2023
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection "upgrade";
+		# Some environments may encounter CORS errors (Kubernetes + Nginx Ingress)
+		# Uncomment the following line to set the Origin request to an empty string
+		# proxy_set_header Origin '';
+
+		chunked_transfer_encoding off;
+
+		proxy_pass http://minio_console; # This uses the upstream directive definition to load balance
+	}
+}

package.json

@@ -87,6 +87,8 @@
 		"mode-watcher": "^0.4.1",
 		"paneforge": "^0.0.5",
 		"rate-limit-redis": "^4.2.0",
+		"redis": "^4.7.0",
+		"redis-om": "^0.4.6",
 		"resend": "^3.5.0",
 		"svelte-sonner": "^0.3.27",
 		"tailwind-merge": "^2.4.0",

pnpm-lock.yaml

@@ -1,4 +1,5 @@
 services:
+  # Web
   - type: web
     name: web
     runtime: node
@@ -9,6 +10,21 @@ services:
     startCommand: npm run db:migrate && node build/index.js
     healthCheckPath: /
     envVars:
+      - key: STORAGE_API_SECRET_KEY
+        fromService:
+          name: minio-server
+          type: web
+          property: MINIO_ROOT_PASSWORD
+      - key: STORAGE_ACCESS_KEY
+        fromService:
+          name: minio-server
+          type: web
+          property: MINIO_ROOT_USER
+      - key: STORAGE_API_URL
+        fromService:
+          name: minio-server
+          type: web
+          property: connectionString
       - key: DATABASE_URL
         fromDatabase:
           name: tofustack
@@ -23,10 +39,62 @@ services:
           name: web
           type: web
           property: host
+  # Redis
   - type: redis
     name: redis
     ipAllowList: [] # Only allow internal connections
 
+  # MinIO Server
+  - type: web
+    name: minio-server
+    healthCheckPath: /minio/health/liveweb
+    runtime: image
+    image:
+      url: docker.io/minio/minio:latest
+    dockerCommand: minio server /data --address $HOST:$PORT --console-address $HOST:$CONSOLE_PORT
+    # Use the following 'dockerCommand' if removing the 'minio-console'
+    # web service
+    # dockerCommand: minio server /data --address $HOST:$PORT
+    autoDeploy: false
+    disk:
+      name: data
+      mountPath: /data
+    envVars:
+    - key: MINIO_ROOT_USER
+      generateValue: true
+    - key: MINIO_ROOT_PASSWORD
+      generateValue: true
+    - key: HOST
+      value: "0.0.0.0"
+    - key: PORT
+      value: 9000
+    - key: CONSOLE_PORT
+      value: 9090
+    # Uncomment the following key/value pair if you are removing the
+    # 'minio-console' web service
+    # - key: MINIO_BROWSER
+    #   value: "off"
+  # MinIO Console
+  - type: web
+    name: minio-console
+    runtime: docker
+    dockerContext: /
+    dockerfilePath: ./Dockerfile.minio
+    autoDeploy: false
+    envVars:
+    - key: PORT
+      value: 10000
+    - key: MINIO_HOST
+      fromService:
+        name: minio-server
+        type: web
+        property: host
+    - key: MINIO_CONSOLE_PORT
+      fromService:
+        name: minio-server
+        type: web
+        envVarKey: CONSOLE_PORT
+
 databases:
   - name: db
     databaseName: tofustack