This commit is contained in:
Andras Bacsai
2022-02-28 16:06:44 +01:00
parent 02abd038fa
commit f340ca9d05
14 changed files with 445 additions and 320 deletions

View File

@@ -2,6 +2,7 @@ import { dev } from '$app/env';
import { asyncExecShell, getDomain, getEngine } from '$lib/common'; import { asyncExecShell, getDomain, getEngine } from '$lib/common';
import got from 'got'; import got from 'got';
import * as db from '$lib/database'; import * as db from '$lib/database';
import { letsEncrypt } from '$lib/letsencrypt';
const url = dev ? 'http://localhost:5555' : 'http://coolify-haproxy:5555'; const url = dev ? 'http://localhost:5555' : 'http://coolify-haproxy:5555';
@@ -71,7 +72,9 @@ export async function removeProxyConfiguration(fqdn) {
export async function forceSSLOffApplication(domain) { export async function forceSSLOffApplication(domain) {
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();
await checkHAProxy(haproxy); await checkHAProxy(haproxy);
let transactionId; let transactionId;
try { try {
const rules: any = await haproxy const rules: any = await haproxy
.get(`v2/services/haproxy/configuration/http_request_rules`, { .get(`v2/services/haproxy/configuration/http_request_rules`, {
@@ -87,7 +90,6 @@ export async function forceSSLOffApplication(domain) {
); );
if (rule) { if (rule) {
transactionId = await getNextTransactionId(); transactionId = await getNextTransactionId();
await haproxy await haproxy
.delete(`v2/services/haproxy/configuration/http_request_rules/${rule.index}`, { .delete(`v2/services/haproxy/configuration/http_request_rules/${rule.index}`, {
searchParams: { searchParams: {
@@ -188,104 +190,140 @@ export async function reloadHaproxy(engine) {
return await asyncExecShell(`DOCKER_HOST=${host} docker exec coolify-haproxy kill -HUP 1`); return await asyncExecShell(`DOCKER_HOST=${host} docker exec coolify-haproxy kill -HUP 1`);
} }
export async function checkProxyConfigurations() { export async function checkProxyConfigurations() {
const timeout = 10;
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();
await checkHAProxy(haproxy); await checkHAProxy(haproxy);
try { try {
const stats: any = await haproxy.get(`v2/services/haproxy/stats/native`).json(); const stats: any = await haproxy.get(`v2/services/haproxy/stats/native`).json();
let transactionId = null;
for (const stat of stats[0].stats) { for (const stat of stats[0].stats) {
if (stat.stats.status === 'DOWN' && stat.type === 'server') { if (stat.stats.status !== 'no check' && stat.type === 'server') {
const { if (!transactionId) await getNextTransactionId();
name, const { backend_name: backendName } = stat;
backend_name: backendName, await haproxy
stats: { lastchg } .delete(`v2/services/haproxy/configuration/backends/${backendName}`, {
} = stat; searchParams: {
transaction_id: transactionId
const { fqdn } = await db.listSettings(); }
if (fqdn) { })
.json();
}
}
if (transactionId) await completeTransaction(transactionId);
} catch (error) {
console.log(error.response.body);
}
}
export async function configureHAProxy(fqdn, id, port, containerRunning, engine) {
const domain = getDomain(fqdn); const domain = getDomain(fqdn);
if (backendName === domain) { const isHttps = fqdn.startsWith('https://');
return; const isWWW = fqdn.includes('www.');
} const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
} const contTest = `{ req.hdr(host) -i ${isWWW ? domain.replace('www.', '') : `www.${domain}`} }`;
const application = await db.prisma.application.findUnique({
where: { id: name }, console.log({ application: true, fqdn, domain, id, port, containerRunning, isHttps, isWWW });
include: { destinationDocker: true }
}); const haproxy = await haproxyInstance();
const service = await db.prisma.service.findUnique({ await checkHAProxy(haproxy);
where: { id: name },
include: { destinationDocker: true } let transactionId;
});
if (!application && !service) { if (!containerRunning) {
const transactionId = await getNextTransactionId(); try {
await haproxy.get(`v2/services/haproxy/configuration/backends/${domain}`).json();
transactionId = await getNextTransactionId();
await haproxy await haproxy
.delete(`v2/services/haproxy/configuration/backends/${backendName}`, { .delete(`v2/services/haproxy/configuration/backends/${domain}`, {
searchParams: { searchParams: {
transaction_id: transactionId transaction_id: transactionId
} }
}) })
.json(); .json();
return await completeTransaction(transactionId); } catch (error) {
//
} }
if (application?.destinationDocker?.engine && lastchg > 120) { try {
const found = await checkContainer(application.destinationDocker.engine, name); if (!transactionId) await getNextTransactionId();
if (!found) { let rules: any;
const transactionId = await getNextTransactionId(); // Force SSL off
await haproxy rules = await haproxy
.delete(`v2/services/haproxy/configuration/backends/${backendName}`, { .get(`v2/services/haproxy/configuration/http_request_rules`, {
searchParams: { searchParams: {
transaction_id: transactionId parent_name: 'http',
parent_type: 'frontend'
}
})
.json();
if (rules.data.length > 0) {
const rule = rules.data.find((rule) =>
rule.cond_test.includes(`{ hdr(host) -i ${domain} } !{ ssl_fc }`)
);
if (rule) {
await haproxy
.delete(`v2/services/haproxy/configuration/http_request_rules/${rule.index}`, {
searchParams: {
transaction_id: transactionId,
parent_name: 'http',
parent_type: 'frontend'
} }
}) })
.json(); .json();
return await completeTransaction(transactionId);
} }
} }
if (service?.destinationDocker?.engine && lastchg > 120) { // Force WWW off
const found = await checkContainer(service.destinationDocker.engine, name); rules = await haproxy
if (!found) { .get(`v2/services/haproxy/configuration/http_request_rules`, {
const transactionId = await getNextTransactionId();
await haproxy
.delete(`v2/services/haproxy/configuration/backends/${backendName}`, {
searchParams: { searchParams: {
transaction_id: transactionId parent_name: 'http',
parent_type: 'frontend'
} }
}) })
.json(); .json();
return await completeTransaction(transactionId); if (rules.data.length > 0) {
} const rule = rules.data.find((rule) => rule.redir_value.includes(redirectValue));
} if (rule) {
if (lastchg > 120) {
const transactionId = await getNextTransactionId();
await haproxy await haproxy
.delete(`v2/services/haproxy/configuration/backends/${backendName}`, { .delete(`v2/services/haproxy/configuration/http_request_rules/${rule.index}`, {
searchParams: { searchParams: {
transaction_id: transactionId transaction_id: transactionId,
parent_name: 'http',
parent_type: 'frontend'
} }
}) })
.json(); .json();
await completeTransaction(transactionId);
}
} }
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
//
} finally {
try {
if (transactionId) {
console.log(transactionId);
await haproxy.put(`v2/services/haproxy/transactions/${transactionId}`);
} }
} } catch (error) {
export async function configureProxyForApplication({ domain, imageId, applicationId, port }) { if (error?.response?.body) {
const haproxy = await haproxyInstance(); const json = JSON.parse(error.response.body);
await checkHAProxy(haproxy); if (json.code === 400 && json.message.includes('could not resolve address')) {
await stopCoolifyProxy(engine);
await startCoolifyProxy(engine);
}
}
}
}
return;
} else {
console.log('adding ', domain);
let serverConfigured = false; let serverConfigured = false;
let backendAvailable: any = null; let backendAvailable: any = null;
try { try {
backendAvailable = await haproxy backendAvailable = await haproxy
.get(`v2/services/haproxy/configuration/backends/${domain}`) .get(`v2/services/haproxy/configuration/backends/${domain}`)
.json(); .json();
const server: any = await haproxy const server: any = await haproxy
.get(`v2/services/haproxy/configuration/servers/${imageId}`, { .get(`v2/services/haproxy/configuration/servers/${id}`, {
searchParams: { searchParams: {
backend: domain backend: domain
} }
@@ -296,8 +334,8 @@ export async function configureProxyForApplication({ domain, imageId, applicatio
// Very sophisticated way to check if the server is already configured in proxy // Very sophisticated way to check if the server is already configured in proxy
if (backendAvailable.data.forwardfor.enabled === 'enabled') { if (backendAvailable.data.forwardfor.enabled === 'enabled') {
if (backendAvailable.data.name === domain) { if (backendAvailable.data.name === domain) {
if (server.data.check === 'enabled') { if (server.data.check === 'disabled') {
if (server.data.address === imageId) { if (server.data.address === id) {
if (server.data.port === port) { if (server.data.port === port) {
serverConfigured = true; serverConfigured = true;
} }
@@ -307,12 +345,13 @@ export async function configureProxyForApplication({ domain, imageId, applicatio
} }
} }
} catch (error) { } catch (error) {
//console.log('error getting backend or server', error?.response?.body);
// //
} }
if (serverConfigured) {
if (serverConfigured) return; console.log('server configured');
const transactionId = await getNextTransactionId(); return;
}
if (!transactionId) transactionId = await getNextTransactionId();
if (backendAvailable) { if (backendAvailable) {
await haproxy await haproxy
.delete(`v2/services/haproxy/configuration/backends/${domain}`, { .delete(`v2/services/haproxy/configuration/backends/${domain}`, {
@@ -323,6 +362,7 @@ export async function configureProxyForApplication({ domain, imageId, applicatio
.json(); .json();
} }
try { try {
console.log('adding ', domain);
await haproxy.post('v2/services/haproxy/configuration/backends', { await haproxy.post('v2/services/haproxy/configuration/backends', {
searchParams: { searchParams: {
transaction_id: transactionId transaction_id: transactionId
@@ -340,16 +380,135 @@ export async function configureProxyForApplication({ domain, imageId, applicatio
backend: domain backend: domain
}, },
json: { json: {
address: imageId, address: id,
check: 'enabled', check: 'disabled',
name: imageId, name: id,
port: port port: port
} }
}); });
let rules: any;
// Force SSL off
rules = await haproxy
.get(`v2/services/haproxy/configuration/http_request_rules`, {
searchParams: {
parent_name: 'http',
parent_type: 'frontend'
}
})
.json();
if (rules.data.length > 0) {
const rule = rules.data.find((rule) =>
rule.cond_test.includes(`{ hdr(host) -i ${domain} } !{ ssl_fc }`)
);
if (rule) {
await haproxy
.delete(`v2/services/haproxy/configuration/http_request_rules/${rule.index}`, {
searchParams: {
transaction_id: transactionId,
parent_name: 'http',
parent_type: 'frontend'
}
})
.json();
}
}
// Generate SSL && force SSL on
if (isHttps) {
await letsEncrypt(domain, id, false);
rules = await haproxy
.get(`v2/services/haproxy/configuration/http_request_rules`, {
searchParams: {
parent_name: 'http',
parent_type: 'frontend'
}
})
.json();
let nextRule = 0;
if (rules.data.length > 0) {
const rule = rules.data.find((rule) =>
rule.cond_test.includes(`{ hdr(host) -i ${domain} } !{ ssl_fc }`)
);
if (rule) return;
nextRule = rules.data[rules.data.length - 1].index + 1;
}
await haproxy
.post(`v2/services/haproxy/configuration/http_request_rules`, {
searchParams: {
transaction_id: transactionId,
parent_name: 'http',
parent_type: 'frontend'
},
json: {
index: nextRule,
cond: 'if',
cond_test: `{ hdr(host) -i ${domain} } !{ ssl_fc }`,
type: 'redirect',
redir_type: 'scheme',
redir_value: 'https',
redir_code: dev ? 302 : 301
}
})
.json();
}
// WWW redirect on
rules = await haproxy
.get(`v2/services/haproxy/configuration/http_request_rules`, {
searchParams: {
parent_name: 'http',
parent_type: 'frontend'
}
})
.json();
let nextRule = 0;
if (rules.data.length > 0) {
const rule = rules.data.find((rule) => rule.redir_value.includes(redirectValue));
if (rule) return;
nextRule = rules.data[rules.data.length - 1].index + 1;
}
await haproxy
.post(`v2/services/haproxy/configuration/http_request_rules`, {
searchParams: {
transaction_id: transactionId,
parent_name: 'http',
parent_type: 'frontend'
},
json: {
index: nextRule,
cond: 'if',
cond_test: contTest,
type: 'redirect',
redir_type: 'location',
redir_value: redirectValue,
redir_code: dev ? 302 : 301
}
})
.json();
} catch (error) { } catch (error) {
console.log(error);
throw error?.response?.body || error; throw error?.response?.body || error;
} finally { } finally {
await completeTransaction(transactionId); try {
if (transactionId) {
console.log('Committing transaction');
await haproxy.put(`v2/services/haproxy/transactions/${transactionId}`);
}
} catch (error) {
if (error?.response?.body) {
const json = JSON.parse(error.response.body);
if (json.code === 400 && json.message.includes('could not resolve address')) {
await stopCoolifyProxy(engine);
await startCoolifyProxy(engine);
}
}
}
}
} }
} }
@@ -444,7 +603,7 @@ export async function configureCoolifyProxyOn(fqdn) {
}, },
json: { json: {
address: dev ? 'host.docker.internal' : 'coolify', address: dev ? 'host.docker.internal' : 'coolify',
check: 'enabled', check: 'enable',
fall: 10, fall: 10,
name: 'coolify', name: 'coolify',
port: 3000 port: 3000
@@ -587,6 +746,7 @@ export async function configureNetworkCoolifyProxy(engine) {
} }
export async function configureSimpleServiceProxyOn({ id, domain, port }) { export async function configureSimpleServiceProxyOn({ id, domain, port }) {
console.log({ service: true, id, domain, port });
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();
await checkHAProxy(haproxy); await checkHAProxy(haproxy);
let serverConfigured = false; let serverConfigured = false;
@@ -637,7 +797,7 @@ export async function configureSimpleServiceProxyOn({ id, domain, port }) {
}, },
json: { json: {
address: id, address: id,
check: 'enabled', check: 'enable',
name: id, name: id,
port: port port: port
} }
@@ -676,6 +836,10 @@ export async function removeWwwRedirection(fqdn) {
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();
await checkHAProxy(); await checkHAProxy();
let transactionId;
try {
const rules: any = await haproxy const rules: any = await haproxy
.get(`v2/services/haproxy/configuration/http_request_rules`, { .get(`v2/services/haproxy/configuration/http_request_rules`, {
searchParams: { searchParams: {
@@ -687,7 +851,7 @@ export async function removeWwwRedirection(fqdn) {
if (rules.data.length > 0) { if (rules.data.length > 0) {
const rule = rules.data.find((rule) => rule.redir_value.includes(redirectValue)); const rule = rules.data.find((rule) => rule.redir_value.includes(redirectValue));
if (rule) { if (rule) {
const transactionId = await getNextTransactionId(); transactionId = await getNextTransactionId();
await haproxy await haproxy
.delete(`v2/services/haproxy/configuration/http_request_rules/${rule.index}`, { .delete(`v2/services/haproxy/configuration/http_request_rules/${rule.index}`, {
searchParams: { searchParams: {
@@ -697,9 +861,13 @@ export async function removeWwwRedirection(fqdn) {
} }
}) })
.json(); .json();
await completeTransaction(transactionId);
} }
} }
} catch (error) {
console.log(error);
} finally {
if (transactionId) await completeTransaction(transactionId);
}
} }
export async function setWwwRedirection(fqdn) { export async function setWwwRedirection(fqdn) {
const haproxy = await haproxyInstance(); const haproxy = await haproxyInstance();

View File

@@ -14,7 +14,7 @@ export default async function ({
buildId buildId
}): Promise<any> { }): Promise<any> {
try { try {
saveBuildLog({ line: 'GitHub importer started', buildId, applicationId }); saveBuildLog({ line: 'GitHub importer started.', buildId, applicationId });
const { privateKey, appId, installationId } = await db.getUniqueGithubApp({ githubAppId }); const { privateKey, appId, installationId } = await db.getUniqueGithubApp({ githubAppId });
const githubPrivateKey = privateKey.replace(/\\n/g, '\n').replace(/"/g, ''); const githubPrivateKey = privateKey.replace(/\\n/g, '\n').replace(/"/g, '');

View File

@@ -5,7 +5,7 @@ import * as db from '$lib/database';
import cuid from 'cuid'; import cuid from 'cuid';
import getPort, { portNumbers } from 'get-port'; import getPort, { portNumbers } from 'get-port';
export async function letsEncrypt({ domain, isCoolify = false, id = null }) { export async function letsEncrypt(domain, id = null, isCoolify = false) {
try { try {
const data = await db.prisma.setting.findFirst(); const data = await db.prisma.setting.findFirst();
const { minPort, maxPort } = data; const { minPort, maxPort } = data;
@@ -47,7 +47,6 @@ export async function letsEncrypt({ domain, isCoolify = false, id = null }) {
} }
} }
} }
await forceSSLOffApplication(domain);
if (dualCerts) { if (dualCerts) {
await asyncExecShell( await asyncExecShell(
`DOCKER_HOST=${host} docker run --rm --name certbot-${randomCuid} -p 9080:${randomPort} -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port ${randomPort} -d ${nakedDomain} -d ${wwwDomain} --expand --agree-tos --non-interactive --register-unsafely-without-email ${ `DOCKER_HOST=${host} docker run --rm --name certbot-${randomCuid} -p 9080:${randomPort} -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port ${randomPort} -d ${nakedDomain} -d ${wwwDomain} --expand --agree-tos --non-interactive --register-unsafely-without-email ${
@@ -71,9 +70,5 @@ export async function letsEncrypt({ domain, isCoolify = false, id = null }) {
if (error.code !== 0) { if (error.code !== 0) {
throw error; throw error;
} }
} finally {
if (!isCoolify) {
await forceSSLOnApplication(domain);
}
} }
} }

View File

@@ -4,12 +4,6 @@ import * as buildpacks from '../buildPacks';
import * as importers from '../importers'; import * as importers from '../importers';
import { dockerInstance } from '../docker'; import { dockerInstance } from '../docker';
import { asyncExecShell, createDirectories, getDomain, getEngine, saveBuildLog } from '../common'; import { asyncExecShell, createDirectories, getDomain, getEngine, saveBuildLog } from '../common';
import {
checkProxyConfigurations,
configureProxyForApplication,
reloadHaproxy,
setWwwRedirection
} from '../haproxy';
import * as db from '$lib/database'; import * as db from '$lib/database';
import { decrypt } from '$lib/crypto'; import { decrypt } from '$lib/crypto';
import { sentry } from '$lib/common'; import { sentry } from '$lib/common';
@@ -261,26 +255,27 @@ export default async function (job) {
sentry.captureException(error); sentry.captureException(error);
throw new Error(error); throw new Error(error);
} }
try { saveBuildLog({ line: 'Proxy will be configured shortly.', buildId, applicationId });
if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) { // try {
saveBuildLog({ line: 'Proxy configuration started!', buildId, applicationId }); // if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
await checkProxyConfigurations(); // saveBuildLog({ line: 'Proxy configuration started!', buildId, applicationId });
await configureProxyForApplication({ domain, imageId, applicationId, port }); // await checkProxyConfigurations();
if (isHttps) await letsEncrypt({ domain, id: applicationId }); // await configureProxyForApplication(domain, imageId, port);
await setWwwRedirection(fqdn); // if (isHttps) await letsEncrypt({ domain, id: applicationId });
await reloadHaproxy(destinationDocker.engine); // await setWwwRedirection(fqdn);
saveBuildLog({ line: 'Proxy configuration successful!', buildId, applicationId }); // await reloadHaproxy(destinationDocker.engine);
} else { // saveBuildLog({ line: 'Proxy configuration successful!', buildId, applicationId });
saveBuildLog({ // } else {
line: 'Coolify Proxy is not configured for this destination. Nothing else to do.', // saveBuildLog({
buildId, // line: 'Coolify Proxy is not configured for this destination. Nothing else to do.',
applicationId // buildId,
}); // applicationId
} // });
} catch (error) { // }
saveBuildLog({ line: error.stdout || error, buildId, applicationId }); // } catch (error) {
sentry.captureException(error); // saveBuildLog({ line: error.stdout || error, buildId, applicationId });
throw new Error(error); // sentry.captureException(error);
} // throw new Error(error);
// }
} }
} }

View File

@@ -87,8 +87,8 @@ const cron = async () => {
await queue.proxy.add('proxy', {}, { repeat: { every: 10000 } }); await queue.proxy.add('proxy', {}, { repeat: { every: 10000 } });
// await queue.ssl.add('ssl', {}, { repeat: { every: 10000 } }); // await queue.ssl.add('ssl', {}, { repeat: { every: 10000 } });
await queue.cleanup.add('cleanup', {}, { repeat: { every: 600000 } }); // await queue.cleanup.add('cleanup', {}, { repeat: { every: 600000 } });
await queue.sslRenew.add('sslRenew', {}, { repeat: { every: 1800000 } }); // await queue.sslRenew.add('sslRenew', {}, { repeat: { every: 1800000 } });
const events = { const events = {
proxy: new QueueEvents('proxy', { ...connectionOptions }), proxy: new QueueEvents('proxy', { ...connectionOptions }),

View File

@@ -1,20 +1,15 @@
import * as db from '$lib/database';
import { getDomain } from '$lib/common'; import { getDomain } from '$lib/common';
import { getApplicationById, prisma, supportedServiceTypesAndVersions } from '$lib/database';
import { dockerInstance } from '$lib/docker';
import { import {
checkContainer, checkContainer,
checkProxyConfigurations, checkProxyConfigurations,
configureCoolifyProxyOn, configureCoolifyProxyOn,
configureProxyForApplication, configureHAProxy,
configureSimpleServiceProxyOn,
forceSSLOnApplication, forceSSLOnApplication,
reloadHaproxy,
setWwwRedirection, setWwwRedirection,
startCoolifyProxy, startCoolifyProxy,
startHttpProxy startHttpProxy
} from '$lib/haproxy'; } from '$lib/haproxy';
import * as db from '$lib/database';
// import { generateRemoteEngine } from '$lib/components/common';
export default async function () { export default async function () {
try { try {
@@ -23,57 +18,22 @@ export default async function () {
console.log(error); console.log(error);
} }
try { try {
// Check destination containers and configure proxy if needed const applications = await db.prisma.application.findMany({
const destinationDockers = await prisma.destinationDocker.findMany({}); include: { destinationDocker: true }
for (const destination of destinationDockers) {
if (destination.isCoolifyProxyUsed) {
// if (destination.remoteEngine) {
// const engine = generateRemoteEngine(destination);
// }
const docker = dockerInstance({ destinationDocker: destination });
const containers = await docker.engine.listContainers();
const configurations = containers.filter(
(container) => container.Labels['coolify.managed']
);
for (const configuration of configurations) {
if (configuration.Labels['coolify.configuration']) {
const parsedConfiguration = JSON.parse(
Buffer.from(configuration.Labels['coolify.configuration'], 'base64').toString()
);
if (
parsedConfiguration &&
configuration.Labels['coolify.type'] === 'standalone-application'
) {
const { fqdn, applicationId, port, pullmergeRequestId } = parsedConfiguration;
if (fqdn) {
const found = await getApplicationById({ id: applicationId });
if (found) {
const domain = getDomain(fqdn);
await configureProxyForApplication({
domain,
imageId: pullmergeRequestId
? `${applicationId}-${pullmergeRequestId}`
: applicationId,
applicationId,
port
}); });
const isHttps = fqdn.startsWith('https://');
if (isHttps) await forceSSLOnApplication(domain); for (const application of applications) {
await setWwwRedirection(fqdn); const {
fqdn,
id,
port,
destinationDocker: { engine }
} = application;
const containerRunning = await checkContainer(engine, id);
await configureHAProxy(fqdn, id, port, containerRunning, engine);
} }
}
} const services = await db.prisma.service.findMany({
}
}
for (const container of containers) {
const image = container.Image.split(':')[0];
const found = supportedServiceTypesAndVersions.find((a) => a.baseImage === image);
if (found) {
const type = found.name;
const mainPort = found.ports.main;
const id = container.Names[0].replace('/', '');
const service = await db.prisma.service.findUnique({
where: { id },
include: { include: {
destinationDocker: true, destinationDocker: true,
minio: true, minio: true,
@@ -82,24 +42,31 @@ export default async function () {
wordpress: true wordpress: true
} }
}); });
const { fqdn } = service;
const domain = getDomain(fqdn); for (const service of services) {
await configureSimpleServiceProxyOn({ id, domain, port: mainPort }); const {
fqdn,
id,
type,
destinationDocker: { engine }
} = service;
const found = db.supportedServiceTypesAndVersions.find((a) => a.name === type);
if (found) {
const port = found.ports.main;
const publicPort = service[type]?.publicPort; const publicPort = service[type]?.publicPort;
const containerRunning = await checkContainer(engine, id);
await configureHAProxy(fqdn, id, port, containerRunning, engine);
if (publicPort) { if (publicPort) {
const containerFound = await checkContainer( const containerFound = await checkContainer(
destination.engine, service.destinationDocker.engine,
`haproxy-for-${publicPort}` `haproxy-for-${publicPort}`
); );
if (!containerFound) { if (!containerFound) {
await startHttpProxy(destination, id, publicPort, 9000); await startHttpProxy(service.destinationDocker, id, publicPort, 9000);
} }
} }
} }
} }
}
}
const services = await prisma.service.findMany({});
// Check Coolify FQDN and configure proxy if needed // Check Coolify FQDN and configure proxy if needed
const { fqdn } = await db.listSettings(); const { fqdn } = await db.listSettings();
if (fqdn) { if (fqdn) {

View File

@@ -20,7 +20,7 @@ export const post: RequestHandler = async (event) => {
const docker = dockerInstance({ destinationDocker }); const docker = dockerInstance({ destinationDocker });
await docker.engine.getContainer(id).stop(); await docker.engine.getContainer(id).stop();
} }
await removeProxyConfiguration(fqdn); // await removeProxyConfiguration(fqdn);
return { return {
status: 200 status: 200
}; };

View File

@@ -24,7 +24,7 @@ export const post: RequestHandler = async (event) => {
const { id } = event.params; const { id } = event.params;
try { try {
await checkHAProxy(); // await checkHAProxy();
const service = await db.getService({ id, teamId }); const service = await db.getService({ id, teamId });
const { const {
type, type,
@@ -96,16 +96,16 @@ export const post: RequestHandler = async (event) => {
} }
try { try {
await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`); await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
await checkProxyConfigurations(); // await checkProxyConfigurations();
await configureSimpleServiceProxyOn({ id, domain, port: consolePort }); // await configureSimpleServiceProxyOn({ id, domain, port: consolePort });
await db.updateMinioService({ id, publicPort }); await db.updateMinioService({ id, publicPort });
await startHttpProxy(destinationDocker, id, publicPort, apiPort); await startHttpProxy(destinationDocker, id, publicPort, apiPort);
if (isHttps) { // if (isHttps) {
await letsEncrypt({ domain, id }); // await letsEncrypt({ domain, id });
} // }
await setWwwRedirection(fqdn); // await setWwwRedirection(fqdn);
await reloadHaproxy(destinationDocker.engine); // await reloadHaproxy(destinationDocker.engine);
return { return {
status: 200 status: 200
}; };

View File

@@ -35,7 +35,7 @@ export const post: RequestHandler = async (event) => {
} }
try { try {
await stopTcpHttpProxy(destinationDocker, publicPort); await stopTcpHttpProxy(destinationDocker, publicPort);
await configureSimpleServiceProxyOff(fqdn); // await configureSimpleServiceProxyOff(fqdn);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }

View File

@@ -56,14 +56,14 @@ export const post: RequestHandler = async (event) => {
try { try {
await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`); await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
await checkProxyConfigurations(); // await checkProxyConfigurations();
await configureSimpleServiceProxyOn({ id, domain, port: 8080 }); // await configureSimpleServiceProxyOn({ id, domain, port: 8080 });
if (isHttps) { // if (isHttps) {
await letsEncrypt({ domain, id }); // await letsEncrypt({ domain, id });
} // }
await setWwwRedirection(fqdn); // await setWwwRedirection(fqdn);
await reloadHaproxy(destinationDocker.engine); // await reloadHaproxy(destinationDocker.engine);
return { return {
status: 200 status: 200
}; };

View File

@@ -187,14 +187,14 @@ COPY ./init-db.sh /docker-entrypoint-initdb.d/init-db.sh`;
await asyncExecShell( await asyncExecShell(
`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up --build -d` `DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up --build -d`
); );
await checkProxyConfigurations(); // await checkProxyConfigurations();
await configureSimpleServiceProxyOn({ id, domain, port: 8000 }); // await configureSimpleServiceProxyOn({ id, domain, port: 8000 });
if (isHttps) { // if (isHttps) {
await letsEncrypt({ domain, id }); // await letsEncrypt({ domain, id });
} // }
await setWwwRedirection(fqdn); // await setWwwRedirection(fqdn);
await reloadHaproxy(destinationDocker.engine); // await reloadHaproxy(destinationDocker.engine);
return { return {
status: 200 status: 200
}; };

View File

@@ -74,14 +74,14 @@ export const post: RequestHandler = async (event) => {
} }
try { try {
await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`); await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
await checkProxyConfigurations(); // await checkProxyConfigurations();
await configureSimpleServiceProxyOn({ id, domain, port: 80 }); // await configureSimpleServiceProxyOn({ id, domain, port: 80 });
if (isHttps) { // if (isHttps) {
await letsEncrypt({ domain, id }); // await letsEncrypt({ domain, id });
} // }
await setWwwRedirection(fqdn); // await setWwwRedirection(fqdn);
await reloadHaproxy(destinationDocker.engine); // await reloadHaproxy(destinationDocker.engine);
return { return {
status: 200 status: 200
}; };

View File

@@ -84,14 +84,14 @@ export const post: RequestHandler = async (event) => {
try { try {
await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`); await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
await checkProxyConfigurations(); // await checkProxyConfigurations();
await configureSimpleServiceProxyOn({ id, domain, port: 8080 }); // await configureSimpleServiceProxyOn({ id, domain, port: 8080 });
if (isHttps) { // if (isHttps) {
await letsEncrypt({ domain, id }); // await letsEncrypt({ domain, id });
} // }
await setWwwRedirection(fqdn); // await setWwwRedirection(fqdn);
await reloadHaproxy(destinationDocker.engine); // await reloadHaproxy(destinationDocker.engine);
return { return {
status: 200 status: 200
}; };

View File

@@ -121,14 +121,14 @@ export const post: RequestHandler = async (event) => {
try { try {
await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`); await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
await checkProxyConfigurations(); // await checkProxyConfigurations();
await configureSimpleServiceProxyOn({ id, domain, port: 80 }); // await configureSimpleServiceProxyOn({ id, domain, port: 80 });
if (isHttps) { // if (isHttps) {
await letsEncrypt({ domain, id }); // await letsEncrypt({ domain, id });
} // }
await setWwwRedirection(fqdn); // await setWwwRedirection(fqdn);
await reloadHaproxy(destinationDocker.engine); // await reloadHaproxy(destinationDocker.engine);
return { return {
status: 200 status: 200
}; };