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

fix: apache on arm

Browse Source
This commit is contained in:
Andras Bacsai 2022-11-30 11:18:19 +01:00
parent 4aaf59d034
commit 3d5ea8629c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/api/src/lib/buildPacks/common.ts
View File

@ -58,8 +58,8 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
label: 'nginx:alpine' label: 'nginx:alpine'
}, },
{ {
value: 'apache:alpine', value: 'httpd:alpine',
label: 'apache:alpine' label: 'httpd:alpine (Apache)'
} }
]; ];
const rustVersions = [ const rustVersions = [
@ -592,6 +592,7 @@ export async function copyBaseConfigurationFiles(
` `
); );
} }
// TODO: Add more configuration files for other buildpacks, like apache2, etc.
} catch (error) { } catch (error) {
throw new Error(error); throw new Error(error);
} }

6
apps/api/src/lib/buildPacks/static.ts
View File

@ -18,7 +18,11 @@ const createDockerfile = async (data, image): Promise<void> => {
const Dockerfile: Array<string> = []; const Dockerfile: Array<string> = [];
Dockerfile.push(`FROM ${image}`); Dockerfile.push(`FROM ${image}`);
Dockerfile.push('WORKDIR /app'); if (baseImage?.includes('httpd')) {
Dockerfile.push('WORKDIR /usr/local/apache2/htdocs/');
} else {
Dockerfile.push('WORKDIR /app');
}
Dockerfile.push(`LABEL coolify.buildId=${buildId}`); Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
if (secrets.length > 0) { if (secrets.length > 0) {
secrets.forEach((secret) => { secrets.forEach((secret) => {