Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #841 from coollabsio/next

Browse Source 
v3.12.10
This commit is contained in:
Andras Bacsai 2023-01-11 11:44:22 +01:00 committed by GitHub
commit 2c9e57cbb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 949 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
apps/api/package.json
View File

@ -16,31 +16,31 @@
}, },
"dependencies": { "dependencies": {
"@breejs/ts-worker": "2.0.0", "@breejs/ts-worker": "2.0.0",
"@fastify/autoload": "5.5.0", "@fastify/autoload": "5.7.0",
"@fastify/cookie": "8.3.0", "@fastify/cookie": "8.3.0",
"@fastify/cors": "8.2.0", "@fastify/cors": "8.2.0",
"@fastify/env": "4.1.0", "@fastify/env": "4.2.0",
"@fastify/jwt": "6.3.3", "@fastify/jwt": "6.5.0",
"@fastify/multipart": "7.3.0", "@fastify/multipart": "7.3.0",
"@fastify/static": "6.5.1", "@fastify/static": "6.6.0",
"@iarna/toml": "2.2.5", "@iarna/toml": "2.2.5",
"@ladjs/graceful": "3.0.2", "@ladjs/graceful": "3.2.1",
"@prisma/client": "4.6.1", "@prisma/client": "4.8.1",
"@sentry/node": "7.21.1", "@sentry/node": "7.30.0",
"@sentry/tracing": "7.21.1", "@sentry/tracing": "7.30.0",
"axe": "11.0.0", "axe": "11.2.1",
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
"bree": "9.1.2", "bree": "9.1.3",
"cabin": "11.0.1", "cabin": "11.1.1",
"compare-versions": "5.0.1", "compare-versions": "5.0.1",
"csv-parse": "5.3.2", "csv-parse": "5.3.3",
"csvtojson": "2.0.10", "csvtojson": "2.0.10",
"cuid": "2.1.8", "cuid": "2.1.8",
"dayjs": "1.11.6", "dayjs": "1.11.7",
"dockerode": "3.3.4", "dockerode": "3.3.4",
"dotenv-extended": "2.9.0", "dotenv-extended": "2.9.0",
"execa": "6.1.0", "execa": "6.1.0",
"fastify": "4.10.2", "fastify": "4.11.0",
"fastify-plugin": "4.3.0", "fastify-plugin": "4.3.0",
"fastify-socket.io": "4.0.0", "fastify-socket.io": "4.0.0",
"generate-password": "1.7.0", "generate-password": "1.7.0",
@ -54,30 +54,30 @@
"node-os-utils": "1.3.7", "node-os-utils": "1.3.7",
"p-all": "4.0.0", "p-all": "4.0.0",
"p-throttle": "5.0.0", "p-throttle": "5.0.0",
"prisma": "4.6.1", "prisma": "4.8.1",
"public-ip": "6.0.1", "public-ip": "6.0.1",
"pump": "3.0.0", "pump": "3.0.0",
"shell-quote": "^1.7.4", "shell-quote": "^1.7.4",
"socket.io": "4.5.3", "socket.io": "4.5.4",
"ssh-config": "4.1.6", "ssh-config": "4.2.0",
"strip-ansi": "7.0.1", "strip-ansi": "7.0.1",
"unique-names-generator": "4.7.1" "unique-names-generator": "4.7.1"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "18.11.9", "@types/node": "18.11.18",
"@types/node-os-utils": "1.3.0", "@types/node-os-utils": "1.3.0",
"@typescript-eslint/eslint-plugin": "5.44.0", "@typescript-eslint/eslint-plugin": "5.48.1",
"@typescript-eslint/parser": "5.44.0", "@typescript-eslint/parser": "5.48.1",
"esbuild": "0.15.15", "esbuild": "0.16.16",
"eslint": "8.28.0", "eslint": "8.31.0",
"eslint-config-prettier": "8.5.0", "eslint-config-prettier": "8.6.0",
"eslint-plugin-prettier": "4.2.1", "eslint-plugin-prettier": "4.2.1",
"nodemon": "2.0.20", "nodemon": "2.0.20",
"prettier": "2.7.1", "prettier": "2.8.2",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"tsconfig-paths": "4.1.0", "tsconfig-paths": "4.1.2",
"types-fastify-socket.io": "0.0.1", "types-fastify-socket.io": "0.0.1",
"typescript": "4.9.3" "typescript": "4.9.4"
}, },
"prisma": { "prisma": {
"seed": "node prisma/seed.js" "seed": "node prisma/seed.js"

2
apps/api/src/lib/buildPacks/laravel.ts
View File

@ -3,7 +3,7 @@ import { generateSecrets } from '../common';
import { buildCacheImageForLaravel, buildImage } from './common'; import { buildCacheImageForLaravel, buildImage } from './common';
const createDockerfile = async (data, image): Promise<void> => { const createDockerfile = async (data, image): Promise<void> => {
const { workdir, applicationId, tag, buildId, port } = data; const { workdir, applicationId, tag, buildId, port, secrets, pullmergeRequestId } = data;
const Dockerfile: Array<string> = []; const Dockerfile: Array<string> = [];
Dockerfile.push(`FROM ${image}`); Dockerfile.push(`FROM ${image}`);

2
apps/api/src/lib/common.ts
View File

@ -19,7 +19,7 @@ import { saveBuildLog, saveDockerRegistryCredentials } from './buildPacks/common
import { scheduler } from './scheduler'; import { scheduler } from './scheduler';
import type { ExecaChildProcess } from 'execa'; import type { ExecaChildProcess } from 'execa';
export const version = '3.12.9'; export const version = '3.12.10';
export const isDev = process.env.NODE_ENV === 'development'; export const isDev = process.env.NODE_ENV === 'development';
export const sentryDSN = export const sentryDSN =
'https://409f09bcb7af47928d3e0f46b78987f3@o1082494.ingest.sentry.io/4504236622217216'; 'https://409f09bcb7af47928d3e0f46b78987f3@o1082494.ingest.sentry.io/4504236622217216';

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "coolify", "name": "coolify",
"description": "An open-source & self-hostable Heroku / Netlify alternative.", "description": "An open-source & self-hostable Heroku / Netlify alternative.",
"version": "3.12.9", "version": "3.12.10",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": "github:coollabsio/coolify", "repository": "github:coollabsio/coolify",
"scripts": { "scripts": {

1049
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff