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

fix: docker compose persistent volumes

Browse Source
This commit is contained in:
Andras Bacsai 2022-11-14 09:11:02 +01:00
parent 30d1ae59ec
commit bec6b961f3
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,20 @@ export default async function (data) {
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
value['volumes'] = volumes // TODO: If we support separated volume for each service, we need to add it here
if (value['volumes'].length > 0) {
value['volumes'] = value['volumes'].map((volume) => {
let [v, path] = volume.split(':');
v = `${applicationId}-${v}`
composeVolumes[v] = {
name: v
}
return `${v}:${path}`
})
}
if (volumes.length > 0) {
value['volumes'] = [...value['volumes'] || '', volumes]
}
if (dockerComposeConfiguration[key].port) { if (dockerComposeConfiguration[key].port) {
value['expose'] = [dockerComposeConfiguration[key].port] value['expose'] = [dockerComposeConfiguration[key].port]
} }
@ -90,7 +103,9 @@ export default async function (data) {
value['networks'] = [...value['networks'] || '', network] value['networks'] = [...value['networks'] || '', network]
dockerComposeYaml.services[key] = { ...dockerComposeYaml.services[key], restart: defaultComposeConfiguration(network).restart, deploy: defaultComposeConfiguration(network).deploy } dockerComposeYaml.services[key] = { ...dockerComposeYaml.services[key], restart: defaultComposeConfiguration(network).restart, deploy: defaultComposeConfiguration(network).deploy }
} }
dockerComposeYaml['volumes'] = Object.assign({ ...dockerComposeYaml['volumes'] }, ...composeVolumes) if (Object.keys(composeVolumes).length > 0) {
dockerComposeYaml['volumes'] = {...composeVolumes}
}
dockerComposeYaml['networks'] = Object.assign({ ...networks }, { [network]: { external: true } }) dockerComposeYaml['networks'] = Object.assign({ ...networks }, { [network]: { external: true } })
await fs.writeFile(`${workdir}/docker-compose.${isYml ? 'yml' : 'yaml'}`, yaml.dump(dockerComposeYaml)); await fs.writeFile(`${workdir}/docker-compose.${isYml ? 'yml' : 'yaml'}`, yaml.dump(dockerComposeYaml));
await executeDockerCmd({ debug, buildId, applicationId, dockerId, command: `docker compose --project-directory ${workdir} pull` }) await executeDockerCmd({ debug, buildId, applicationId, dockerId, command: `docker compose --project-directory ${workdir} pull` })