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

feat: revert to remote image

Browse Source
This commit is contained in:
Andras Bacsai
2022-12-01 15:51:18 +01:00
parent cd3af7fa39
commit 1a28e65e50
3 changed files with 125 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
apps/api/src/jobs/deployApplication.ts
View File

@@ -214,7 +214,6 @@ import * as buildpacks from '../lib/buildPacks';
return;
}
const originalApplicationId = application.id
const {
id: applicationId,
@@ -259,7 +258,16 @@ import * as buildpacks from '../lib/buildPacks';
let imageId = applicationId;
let domain = getDomain(fqdn);
let tag = null
let location = null;
let tag = null;
let customTag = null;
let imageName = null;
let imageFoundLocally = false;
let imageFoundRemotely = false;
if (pullmergeRequestId) {
const previewApplications = await prisma.previewApplication.findMany({ where: { applicationId: originalApplicationId, pullmergeRequestId } })
if (previewApplications.length > 0) {
@@ -363,6 +371,12 @@ import * as buildpacks from '../lib/buildPacks';
tag = `${commit.slice(0, 7)}-${pullmergeRequestId}`;
}
customTag = application.dockerRegistryImageName.split(':')[1] || tag;
if (pullmergeRequestId) {
customTag = `${customTag}-${pullmergeRequestId}`;
}
imageName = application.dockerRegistryImageName.split(':')[0];
try {
await prisma.build.update({ where: { id: buildId }, data: { commit } });
} catch (err) { }
@@ -380,16 +394,32 @@ import * as buildpacks from '../lib/buildPacks';
deployNeeded = true;
}
let imageFound = false;
try {
await executeDockerCmd({
dockerId: destinationDocker.id,
command: `docker image inspect ${applicationId}:${tag}`
})
imageFound = true;
imageFoundLocally = true;
} catch (error) {
//
}
const { url, username, password } = dockerRegistry
location = await saveDockerRegistryCredentials({ url, username, password, workdir })
try {
await executeDockerCmd({
dockerId: destinationDocker.id,
command: `docker ${location ? `--config ${location}` : ''} pull ${imageName}:${customTag}`
})
imageFoundRemotely = true;
} catch (error) {
//
}
let imageFound = `${applicationId}:${tag}`
if (imageFoundRemotely) {
imageFound = `${imageName}:${customTag}`
}
await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
const labels = makeLabelForStandaloneApplication({
applicationId,
@@ -410,7 +440,7 @@ import * as buildpacks from '../lib/buildPacks';
publishDirectory
});
if (forceRebuild) deployNeeded = true
if (!imageFound || deployNeeded) {
if ((!imageFoundLocally && !imageFoundRemotely) || deployNeeded) {
if (buildpacks[buildPack])
await buildpacks[buildPack]({
dockerId: destinationDocker.id,
@@ -456,7 +486,15 @@ import * as buildpacks from '../lib/buildPacks';
throw new Error(`Build pack ${buildPack} not found.`);
}
} else {
await saveBuildLog({ line: 'Build image already available - no rebuild required.', buildId, applicationId });
if (imageFoundRemotely) {
await saveBuildLog({ line: `Container image ${imageFound} found in Docker Registry - reuising it`, buildId, applicationId });
} else {
if (imageFoundLocally) {
await saveBuildLog({ line: `Container image ${imageFound} found locally - reuising it`, buildId, applicationId });
}
}
}
if (buildPack === 'compose') {
@@ -550,7 +588,7 @@ import * as buildpacks from '../lib/buildPacks';
version: '3.8',
services: {
[imageId]: {
image: `${applicationId}:${tag}`,
image: imageFound,
container_name: imageId,
volumes,
env_file: envFound ? [`${workdir}/.env`] : [],
@@ -610,9 +648,7 @@ import * as buildpacks from '../lib/buildPacks';
return;
}
try {
if (application.dockerRegistryImageName) {
const customTag = application.dockerRegistryImageName.split(':')[1] || tag;
const imageName = application.dockerRegistryImageName.split(':')[0];
if (application.dockerRegistryImageName && (!imageFoundRemotely || forceRebuild)) {
await saveBuildLog({ line: `Pushing ${imageName}:${customTag} to Docker Registry... It could take a while...`, buildId, applicationId: application.id });
await pushToRegistry(application, workdir, tag, imageName, customTag)
await saveBuildLog({ line: "Success 🎉", buildId, applicationId: application.id });

39
apps/api/src/routes/api/v1/applications/handlers.ts
View File

@@ -7,7 +7,7 @@ import yaml from 'js-yaml';
import csv from 'csvtojson';
import { day } from '../../../../lib/dayjs';
import { setDefaultBaseImage, setDefaultConfiguration } from '../../../../lib/buildPacks/common';
import { saveDockerRegistryCredentials, setDefaultBaseImage, setDefaultConfiguration } from '../../../../lib/buildPacks/common';
import { checkDomainsIsValidInDNS, checkExposedPort, createDirectories, decrypt, defaultComposeConfiguration, encrypt, errorHandler, executeDockerCmd, generateSshKeyPair, getContainerUsage, getDomain, isDev, isDomainConfigured, listSettings, prisma, stopBuild, uniqueName } from '../../../../lib/common';
import { checkContainer, formatLabelsOnDocker, removeContainer } from '../../../../lib/docker';
@@ -458,8 +458,8 @@ export async function restartApplication(request: FastifyRequest<RestartApplicat
if (application?.destinationDockerId) {
const buildId = cuid();
const { id: dockerId, network } = application.destinationDocker;
const { secrets, pullmergeRequestId, port, repository, persistentStorage, id: applicationId, buildPack, exposePort } = application;
const { dockerRegistry, secrets, pullmergeRequestId, port, repository, persistentStorage, id: applicationId, buildPack, exposePort } = application;
let location = null;
const envs = [
`PORT=${port}`
];
@@ -480,7 +480,9 @@ export async function restartApplication(request: FastifyRequest<RestartApplicat
});
}
const { workdir } = await createDirectories({ repository, buildId });
const labels = []
const labels = [
`coolify.managed=true`,
]
let image = null
if (imageId) {
image = imageId
@@ -497,18 +499,30 @@ export async function restartApplication(request: FastifyRequest<RestartApplicat
})
}
}
let imageFound = false;
const { url, username, password } = dockerRegistry
location = await saveDockerRegistryCredentials({ url, username, password, workdir })
let imageFoundLocally = false;
try {
await executeDockerCmd({
dockerId,
command: `docker image inspect ${image}`
})
imageFound = true;
imageFoundLocally = true;
} catch (error) {
//
}
if (!imageFound) {
let imageFoundRemotely = false;
try {
await executeDockerCmd({
dockerId,
command: `docker ${location ? `--config ${location}` : ''} pull ${image}`
})
imageFoundRemotely = true;
} catch (error) {
//
}
if (!imageFoundLocally && !imageFoundRemotely) {
throw { status: 500, message: 'Image not found, cannot restart application.' }
}
await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
@@ -554,8 +568,13 @@ export async function restartApplication(request: FastifyRequest<RestartApplicat
volumes: Object.assign({}, ...composeVolumes)
};
await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(composeFile));
await executeDockerCmd({ dockerId, command: `docker stop -t 0 ${id}` })
await executeDockerCmd({ dockerId, command: `docker rm ${id}` })
try {
await executeDockerCmd({ dockerId, command: `docker stop -t 0 ${id}` })
await executeDockerCmd({ dockerId, command: `docker rm ${id}` })
} catch (error) {
//
}
await executeDockerCmd({ dockerId, command: `docker compose --project-directory ${workdir} up -d` })
return reply.code(201).send();
}