mirror of
https://github.com/Portabase/portabase.git
synced 2026-07-14 11:16:13 +02:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
+1
-1
@@ -33,5 +33,5 @@ keywords:
|
||||
- web-ui
|
||||
- agent
|
||||
license: Apache-2.0
|
||||
version: 1.14.1
|
||||
version: 1.15.0
|
||||
date-released: '2026-03-02'
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
import { NextResponse } from "next/server";
|
||||
|
||||
export async function GET() {
|
||||
return NextResponse.json({ success: true });
|
||||
}
|
||||
+11
-5
@@ -1,10 +1,10 @@
|
||||
services:
|
||||
app:
|
||||
# build:
|
||||
# context: .
|
||||
# dockerfile: docker/dockerfile/Dockerfile
|
||||
# target: prod
|
||||
image: portabase/portabase:1.7.1
|
||||
# build:
|
||||
# context: .
|
||||
# dockerfile: docker/dockerfile/Dockerfile
|
||||
# target: prod
|
||||
image: portabase/portabase:1
|
||||
ports:
|
||||
- '8887:80'
|
||||
environment:
|
||||
@@ -17,6 +17,12 @@ services:
|
||||
db:
|
||||
condition: service_healthy
|
||||
container_name: portabase-app-prod
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "curl -f http://localhost/api/health"]
|
||||
interval: 30s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
start_period: 60s
|
||||
|
||||
db:
|
||||
image: postgres:16-alpine
|
||||
|
||||
@@ -27,6 +27,30 @@ spec:
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
startupProbe:
|
||||
httpGet:
|
||||
path: /api/health
|
||||
port: 80
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 10
|
||||
failureThreshold: 12
|
||||
timeoutSeconds: 5
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /api/health
|
||||
port: 80
|
||||
initialDelaySeconds: 0
|
||||
periodSeconds: 30
|
||||
timeoutSeconds: 5
|
||||
failureThreshold: 3
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /api/health
|
||||
port: 80
|
||||
initialDelaySeconds: 0
|
||||
periodSeconds: 10
|
||||
timeoutSeconds: 5
|
||||
failureThreshold: 3
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "portabase",
|
||||
"version": "1.14.1",
|
||||
"version": "1.15.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev --turbopack -p 8887",
|
||||
|
||||
@@ -71,6 +71,7 @@ function checkRouteExists(pathname: string) {
|
||||
/^\/api\/tus\/hooks\/?$/,
|
||||
/^\/api\/events\/?$/,
|
||||
/^\/api\/config\/?$/,
|
||||
/^\/api\/health\/?$/,
|
||||
/^\/api\/google\/drive\/callback\/?$/,
|
||||
];
|
||||
return routePatterns.some((pattern) => pattern.test(pathname));
|
||||
|
||||
+3
-5
@@ -1,9 +1,8 @@
|
||||
import pino, { type Logger } from "pino";
|
||||
import {env} from "@/env.mjs";
|
||||
|
||||
const isProd = env.NODE_ENV === "production";
|
||||
const isProd = process.env.NODE_ENV === "production";
|
||||
const defaultLevel = isProd ? "info" : "debug";
|
||||
const level = (env.LOG_LEVEL ?? defaultLevel) as pino.Level;
|
||||
const level = (process.env.LOG_LEVEL ?? defaultLevel) as pino.Level;
|
||||
|
||||
function getLocalTimestamp() {
|
||||
const date = new Date();
|
||||
@@ -22,9 +21,8 @@ function getLocalTimestamp() {
|
||||
}
|
||||
|
||||
export const logger: Logger = pino({
|
||||
level,
|
||||
level: level,
|
||||
base: null,
|
||||
|
||||
...(isProd
|
||||
? {
|
||||
timestamp: getLocalTimestamp,
|
||||
|
||||
Reference in New Issue
Block a user