Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: wrong port in case of docker compose

Browse Source
This commit is contained in:
Andras Bacsai 2022-12-09 11:21:25 +01:00
parent 2e3c815e53
commit 95e8b29fa2
1 changed files with 119 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
apps/api/src/lib/buildPacks/compose.ts
View File

@ -1,6 +1,6 @@
import { promises as fs } from 'fs'; import { promises as fs } from 'fs';
import { defaultComposeConfiguration, executeCommand } from '../common'; import { defaultComposeConfiguration, executeCommand } from '../common';
import { buildImage, saveBuildLog } from './common'; import { saveBuildLog } from './common';
import yaml from 'js-yaml'; import yaml from 'js-yaml';
export default async function (data) { export default async function (data) {
@ -16,24 +16,20 @@ export default async function (data) {
baseDirectory, baseDirectory,
secrets, secrets,
pullmergeRequestId, pullmergeRequestId,
port,
dockerComposeConfiguration, dockerComposeConfiguration,
dockerComposeFileLocation dockerComposeFileLocation
} = data } = data;
const fileYaml = `${workdir}${baseDirectory}${dockerComposeFileLocation}` const fileYaml = `${workdir}${baseDirectory}${dockerComposeFileLocation}`;
const dockerComposeRaw = await fs.readFile(fileYaml, 'utf8'); const dockerComposeRaw = await fs.readFile(fileYaml, 'utf8');
const dockerComposeYaml = yaml.load(dockerComposeRaw) const dockerComposeYaml = yaml.load(dockerComposeRaw);
if (!dockerComposeYaml.services) { if (!dockerComposeYaml.services) {
throw 'No Services found in docker-compose file.' throw 'No Services found in docker-compose file.';
} }
const envs = []; const envs = [];
if (Object.entries(dockerComposeYaml.services).length === 1) {
envs.push(`PORT=${port}`)
}
if (secrets.length > 0) { if (secrets.length > 0) {
secrets.forEach((secret) => { secrets.forEach((secret) => {
if (pullmergeRequestId) { if (pullmergeRequestId) {
const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret) const isSecretFound = secrets.filter((s) => s.name === secret.name && s.isPRMRSecret);
if (isSecretFound.length > 0) { if (isSecretFound.length > 0) {
envs.push(`${secret.name}=${isSecretFound[0].value}`); envs.push(`${secret.name}=${isSecretFound[0].value}`);
} else { } else {
@ -58,58 +54,73 @@ export default async function (data) {
for (const volume of volumes) { for (const volume of volumes) {
let [v, path] = volume.split(':'); let [v, path] = volume.split(':');
composeVolumes[v] = { composeVolumes[v] = {
name: v, name: v
} };
} }
} }
let networks = {} let networks = {};
for (let [key, value] of Object.entries(dockerComposeYaml.services)) { for (let [key, value] of Object.entries(dockerComposeYaml.services)) {
value['container_name'] = `${applicationId}-${key}` value['container_name'] = `${applicationId}-${key}`;
value['env_file'] = envFound ? [`${workdir}/.env`] : [] value['env_file'] = envFound ? [`${workdir}/.env`] : [];
value['labels'] = labels value['labels'] = labels;
// TODO: If we support separated volume for each service, we need to add it here // TODO: If we support separated volume for each service, we need to add it here
if (value['volumes']?.length > 0) { if (value['volumes']?.length > 0) {
value['volumes'] = value['volumes'].map((volume) => { value['volumes'] = value['volumes'].map((volume) => {
let [v, path, permission] = volume.split(':'); let [v, path, permission] = volume.split(':');
if (!path) { if (!path) {
path = v; path = v;
v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}` v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`;
} else { } else {
v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}` v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`;
} }
composeVolumes[v] = { composeVolumes[v] = {
name: v name: v
} };
return `${v}:${path}${permission ? ':' + permission : ''}` return `${v}:${path}${permission ? ':' + permission : ''}`;
}) });
} }
if (volumes.length > 0) { if (volumes.length > 0) {
for (const volume of volumes) { for (const volume of volumes) {
value['volumes'].push(volume) value['volumes'].push(volume);
} }
} }
if (dockerComposeConfiguration[key].port) { if (dockerComposeConfiguration[key].port) {
value['expose'] = [dockerComposeConfiguration[key].port] value['expose'] = [dockerComposeConfiguration[key].port];
} }
if (value['networks']?.length > 0) { if (value['networks']?.length > 0) {
value['networks'].forEach((network) => { value['networks'].forEach((network) => {
networks[network] = { networks[network] = {
name: network name: network
};
});
} }
}) value['networks'] = [...(value['networks'] || ''), network];
} dockerComposeYaml.services[key] = {
value['networks'] = [...value['networks'] || '', network] ...dockerComposeYaml.services[key],
dockerComposeYaml.services[key] = { ...dockerComposeYaml.services[key], restart: defaultComposeConfiguration(network).restart, deploy: defaultComposeConfiguration(network).deploy } restart: defaultComposeConfiguration(network).restart,
deploy: defaultComposeConfiguration(network).deploy
};
} }
if (Object.keys(composeVolumes).length > 0) { if (Object.keys(composeVolumes).length > 0) {
dockerComposeYaml['volumes'] = { ...composeVolumes } dockerComposeYaml['volumes'] = { ...composeVolumes };
} }
dockerComposeYaml['networks'] = Object.assign({ ...networks }, { [network]: { external: true } }) dockerComposeYaml['networks'] = Object.assign({ ...networks }, { [network]: { external: true } });
await fs.writeFile(fileYaml, yaml.dump(dockerComposeYaml)); await fs.writeFile(fileYaml, yaml.dump(dockerComposeYaml));
await executeCommand({ debug, buildId, applicationId, dockerId, command: `docker compose --project-directory ${workdir} pull` }) await executeCommand({
debug,
buildId,
applicationId,
dockerId,
command: `docker compose --project-directory ${workdir} pull`
});
await saveBuildLog({ line: 'Pulling images from Compose file...', buildId, applicationId }); await saveBuildLog({ line: 'Pulling images from Compose file...', buildId, applicationId });
await executeCommand({ debug, buildId, applicationId, dockerId, command: `docker compose --project-directory ${workdir} build --progress plain` }) await executeCommand({
debug,
buildId,
applicationId,
dockerId,
command: `docker compose --project-directory ${workdir} build --progress plain`
});
await saveBuildLog({ line: 'Building images from Compose file...', buildId, applicationId }); await saveBuildLog({ line: 'Building images from Compose file...', buildId, applicationId });
} }