dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #529 from coollabsio/next

Browse Source 
v3.2.2
This commit is contained in:
Andras Bacsai
2022-08-11 18:39:04 +02:00
committed by GitHub
parent 61c3f57f4a bfa5fb6f16
commit bb210085b0
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/api/src/index.ts
View File

@@ -16,9 +16,9 @@ declare module 'fastify' {
COOLIFY_DATABASE_URL: string, COOLIFY_DATABASE_URL: string,
COOLIFY_SENTRY_DSN: string, COOLIFY_SENTRY_DSN: string,
COOLIFY_IS_ON: string, COOLIFY_IS_ON: string,
COOLIFY_WHITE_LABELED: boolean, COOLIFY_WHITE_LABELED: string,
COOLIFY_WHITE_LABELED_ICON: string | null, COOLIFY_WHITE_LABELED_ICON: string | null,
COOLIFY_AUTO_UPDATE: boolean, COOLIFY_AUTO_UPDATE: string,
}; };
} }
} }

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

@@ -17,7 +17,7 @@ import { checkContainer, removeContainer } from './docker';
import { day } from './dayjs'; import { day } from './dayjs';
import * as serviceFields from './serviceFields' import * as serviceFields from './serviceFields'
export const version = '3.2.1'; export const version = '3.2.2';
export const isDev = process.env.NODE_ENV === 'development'; export const isDev = process.env.NODE_ENV === 'development';
const algorithm = 'aes-256-ctr'; const algorithm = 'aes-256-ctr';

6
apps/api/src/routes/api/v1/destinations/handlers.ts
View File

@@ -60,7 +60,7 @@ export async function getDestination(request: FastifyRequest<OnlyId>) {
throw { status: 404, message: `Destination not found.` }; throw { status: 404, message: `Destination not found.` };
} }
const settings = await listSettings(); const settings = await listSettings();
let payload = { const payload = {
destination, destination,
settings settings
}; };
@@ -218,7 +218,11 @@ export async function verifyRemoteDockerEngine(request: FastifyRequest, reply: F
if (!stdout) { if (!stdout) {
await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable ${network}`); await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable ${network}`);
} }
const { stdout:coolifyNetwork } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=coolify-infra' --no-trunc --format "{{json .}}"`);
if (!coolifyNetwork) {
await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable coolify-infra`);
}
await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } }) await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } })
return reply.code(201).send() return reply.code(201).send()

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.2.1", "version": "3.2.2",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": "github:coollabsio/coolify", "repository": "github:coollabsio/coolify",
"scripts": { "scripts": {