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

fix: replace docker compose with docker-compose on CSB

Browse Source
This commit is contained in:
Andras Bacsai 2022-08-15 09:27:54 +00:00
parent 68d06dcd19
commit c2c9d992e7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/api/src/lib/common.ts
View File

@ -579,6 +579,11 @@ export async function executeDockerCmd({ dockerId, command }: { dockerId: string
} else { } else {
engine = 'unix:///var/run/docker.sock' engine = 'unix:///var/run/docker.sock'
} }
if (process.env.CODESANDBOX_HOST) {
if (command.startsWith('docker compose')) {
command = command.replace(/docker compose/gi, 'docker-compose')
}
}
return await asyncExecShell( return await asyncExecShell(
`DOCKER_BUILDKIT=1 DOCKER_HOST="${engine}" ${command}` `DOCKER_BUILDKIT=1 DOCKER_HOST="${engine}" ${command}`
); );
@ -873,11 +878,11 @@ export function generateDatabaseConfiguration(database: any, arch: string):
} }
if (isARM(arch)) { if (isARM(arch)) {
configuration.volume = `${id}-${type}-data:/var/lib/postgresql`; configuration.volume = `${id}-${type}-data:/var/lib/postgresql`;
configuration.environmentVariables = { configuration.environmentVariables = {
POSTGRES_PASSWORD: dbUserPassword, POSTGRES_PASSWORD: dbUserPassword,
POSTGRES_USER: dbUser, POSTGRES_USER: dbUser,
POSTGRES_DB: defaultDatabase POSTGRES_DB: defaultDatabase
} }
} }
return configuration return configuration
} else if (type === 'redis') { } else if (type === 'redis') {