fix: Some nasty bug

fix: Automatic reconfiguration of all services and service proxies
This commit is contained in:
Andras Bacsai
2022-02-15 21:44:36 +01:00
parent 3ae7624361
commit 531c712ea5
11 changed files with 181 additions and 100 deletions

View File

@@ -102,17 +102,22 @@
}
}
async function forceRestartProxy() {
try {
restarting = true;
toast.push('Coolify Proxy restarting...');
await post(`/destinations/${id}/restart.json`, {
engine: destination.engine,
fqdn: settings.fqdn
});
} catch ({ error }) {
setTimeout(() => {
window.location.reload();
}, 5000);
const sure = confirm(
'Are you sure you want to restart the proxy? Everyting will be reconfigured in ~10 sec.'
);
if (sure) {
try {
restarting = true;
toast.push('Coolify Proxy restarting...');
await post(`/destinations/${id}/restart.json`, {
engine: destination.engine,
fqdn: settings.fqdn
});
} catch ({ error }) {
setTimeout(() => {
window.location.reload();
}, 5000);
}
}
}
</script>

View File

@@ -15,6 +15,7 @@ import {
import getPort from 'get-port';
import { getDomain } from '$lib/components/common';
import { ErrorHandler } from '$lib/database';
import { makeLabelForServices } from '$lib/buildPacks/common';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -63,7 +64,8 @@ export const post: RequestHandler = async (event) => {
environment: config.environmentVariables,
networks: [network],
volumes: [config.volume],
restart: 'always'
restart: 'always',
labels: makeLabelForServices('minio')
}
},
networks: {

View File

@@ -12,6 +12,7 @@ import {
} from '$lib/haproxy';
import { getDomain } from '$lib/components/common';
import { ErrorHandler } from '$lib/database';
import { makeLabelForServices } from '$lib/buildPacks/common';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -39,7 +40,8 @@ export const post: RequestHandler = async (event) => {
container_name: id,
image: `nocodb/nocodb:${version}`,
networks: [network],
restart: 'always'
restart: 'always',
labels: makeLabelForServices('nocodb')
}
},
networks: {

View File

@@ -12,6 +12,7 @@ import {
} from '$lib/haproxy';
import { getDomain } from '$lib/components/common';
import { ErrorHandler } from '$lib/database';
import { makeLabelForServices } from '$lib/buildPacks/common';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -82,7 +83,6 @@ export const post: RequestHandler = async (event) => {
const network = destinationDockerId && destinationDocker.network;
const host = getEngine(destinationDocker.engine);
const engine = destinationDocker.engine;
// const labels = await makeLabelForPlausibleAnalytics({ id, })
const { workdir } = await createDirectories({ repository: type, buildId: id });
@@ -138,7 +138,8 @@ COPY ./init-db.sh /docker-entrypoint-initdb.d/init-db.sh`;
environment: config.plausibleAnalytics.environmentVariables,
volumes: [config.postgresql.volume],
restart: 'always',
depends_on: [`${id}-postgresql`, `${id}-clickhouse`]
depends_on: [`${id}-postgresql`, `${id}-clickhouse`],
labels: makeLabelForServices('plausibleAnalytics')
},
[`${id}-postgresql`]: {
container_name: `${id}-postgresql`,

View File

@@ -12,6 +12,7 @@ import {
} from '$lib/haproxy';
import { getDomain } from '$lib/components/common';
import { getServiceImage, ErrorHandler } from '$lib/database';
import { makeLabelForServices } from '$lib/buildPacks/common';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -46,7 +47,8 @@ export const post: RequestHandler = async (event) => {
image: config.image,
networks: [network],
volumes: [config.volume],
restart: 'always'
restart: 'always',
labels: makeLabelForServices('vaultWarden')
}
},
networks: {

View File

@@ -12,6 +12,7 @@ import {
} from '$lib/haproxy';
import { getDomain } from '$lib/components/common';
import { ErrorHandler } from '$lib/database';
import { makeLabelForServices } from '$lib/buildPacks/common';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -54,7 +55,8 @@ export const post: RequestHandler = async (event) => {
environment: config.environmentVariables,
networks: [network],
volumes: [config.volume],
restart: 'always'
restart: 'always',
labels: makeLabelForServices('vscodeServer')
}
},
networks: {

View File

@@ -12,6 +12,7 @@ import {
} from '$lib/haproxy';
import { getDomain } from '$lib/components/common';
import { ErrorHandler } from '$lib/database';
import { makeLabelForServices } from '$lib/buildPacks/common';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -78,7 +79,8 @@ export const post: RequestHandler = async (event) => {
environment: config.wordpress.environmentVariables,
networks: [network],
restart: 'always',
depends_on: [`${id}-mysql`]
depends_on: [`${id}-mysql`],
labels: makeLabelForServices('wordpress')
},
[`${id}-mysql`]: {
container_name: `${id}-mysql`,