fix: remove old minio proxies
This commit is contained in:
@@ -14,7 +14,6 @@ import sshConfig from 'ssh-config';
|
||||
|
||||
import { checkContainer, removeContainer } from './docker';
|
||||
import { day } from './dayjs';
|
||||
import * as serviceFields from './services/serviceFields';
|
||||
import { saveBuildLog } from './buildPacks/common';
|
||||
import { scheduler } from './scheduler';
|
||||
|
||||
@@ -1470,50 +1469,6 @@ export async function getServiceFromDB({
|
||||
return { ...body, settings };
|
||||
}
|
||||
|
||||
export function saveUpdateableFields(type: string, data: any) {
|
||||
const update = {};
|
||||
if (type && serviceFields[type]) {
|
||||
serviceFields[type].map((k) => {
|
||||
let temp = data[k.name];
|
||||
if (temp) {
|
||||
if (k.isEncrypted) {
|
||||
temp = encrypt(temp);
|
||||
}
|
||||
if (k.isLowerCase) {
|
||||
temp = temp.toLowerCase();
|
||||
}
|
||||
if (k.isNumber) {
|
||||
temp = Number(temp);
|
||||
}
|
||||
if (k.isBoolean) {
|
||||
temp = Boolean(temp);
|
||||
}
|
||||
}
|
||||
if (k.isNumber && temp === '') {
|
||||
temp = null;
|
||||
}
|
||||
update[k.name] = temp;
|
||||
});
|
||||
}
|
||||
return update;
|
||||
}
|
||||
|
||||
export function getUpdateableFields(type: string, data: any) {
|
||||
const update = {};
|
||||
if (type && serviceFields[type]) {
|
||||
serviceFields[type].map((k) => {
|
||||
let temp = data[k.name];
|
||||
if (temp) {
|
||||
if (k.isEncrypted) {
|
||||
temp = decrypt(temp);
|
||||
}
|
||||
update[k.name] = temp;
|
||||
}
|
||||
update[k.name] = temp;
|
||||
});
|
||||
}
|
||||
return update;
|
||||
}
|
||||
|
||||
export function fixType(type) {
|
||||
return type?.replaceAll(' ', '').toLowerCase() || null;
|
||||
|
@@ -140,8 +140,22 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
|
||||
await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
|
||||
await startServiceContainers(fastify, id, teamId, destinationDocker.id, composeFileDestination)
|
||||
if (service.type === 'minio') {
|
||||
await stopTcpHttpProxy(id, destinationDocker, 9000);
|
||||
|
||||
try {
|
||||
await executeDockerCmd({
|
||||
dockerId: destinationDocker.id,
|
||||
command:
|
||||
`docker container ls -a --filter 'name=${id}-' --format {{.ID}}|xargs -r -n 1 docker container stop -t 0`
|
||||
});
|
||||
|
||||
} catch (error) { }
|
||||
try {
|
||||
await executeDockerCmd({
|
||||
dockerId: destinationDocker.id,
|
||||
command:
|
||||
`docker container ls -a --filter 'name=${id}-' --format {{.ID}}|xargs -r -n 1 docker container rm -f`
|
||||
});
|
||||
} catch (error) { }
|
||||
|
||||
}
|
||||
return {}
|
||||
} catch ({ status, message }) {
|
||||
|
Reference in New Issue
Block a user