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

fix: arm servics

Browse Source
This commit is contained in:
Andras Bacsai
2023-02-21 12:35:20 +01:00
parent 3c37d22a6e
commit b777e08542
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ import { saveBuildLog, saveDockerRegistryCredentials } from './buildPacks/common
import { scheduler } from './scheduler'; import { scheduler } from './scheduler';
import type { ExecaChildProcess } from 'execa'; import type { ExecaChildProcess } from 'execa';
export const version = '3.12.20'; export const version = '3.12.21';
export const isDev = process.env.NODE_ENV === 'development'; export const isDev = process.env.NODE_ENV === 'development';
export const proxyPort = process.env.COOLIFY_PROXY_PORT; export const proxyPort = process.env.COOLIFY_PROXY_PORT;
export const proxySecurePort = process.env.COOLIFY_PROXY_SECURE_PORT; export const proxySecurePort = process.env.COOLIFY_PROXY_SECURE_PORT;

14
apps/api/src/lib/services/handlers.ts
View File

@@ -50,8 +50,7 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
const config = {}; const config = {};
for (const s in template.services) { for (const s in template.services) {
let newEnvironments = [] let newEnvironments = []
if (arm) { if (arm && template.services[s]?.environmentArm?.length > 0) {
if (template.services[s]?.environmentArm?.length > 0) {
for (const environment of template.services[s].environmentArm) { for (const environment of template.services[s].environmentArm) {
let [env, ...value] = environment.split("="); let [env, ...value] = environment.split("=");
value = value.join("=") value = value.join("=")
@@ -60,8 +59,7 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
} }
} }
} }
} else { if (!arm && template.services[s]?.environment?.length > 0) {
if (template.services[s]?.environment?.length > 0) {
for (const environment of template.services[s].environment) { for (const environment of template.services[s].environment) {
let [env, ...value] = environment.split("="); let [env, ...value] = environment.split("=");
value = value.join("=") value = value.join("=")
@@ -70,7 +68,6 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
} }
} }
} }
}
const secrets = await verifyAndDecryptServiceSecrets(id) const secrets = await verifyAndDecryptServiceSecrets(id)
for (const secret of secrets) { for (const secret of secrets) {
const { name, value } = secret const { name, value } = secret
@@ -87,9 +84,10 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
} }
const customVolumes = await prisma.servicePersistentStorage.findMany({ where: { serviceId: id } }) const customVolumes = await prisma.servicePersistentStorage.findMany({ where: { serviceId: id } })
let volumes = new Set() let volumes = new Set()
if (arm) { if (arm && template.services[s]?.volumesArm?.length > 0) {
template.services[s]?.volumesArm && template.services[s].volumesArm.length > 0 && template.services[s].volumesArm.forEach(v => volumes.add(v)) template.services[s].volumesArm.forEach(v => volumes.add(v))
} else { }
if (!arm && template.services[s]?.volumes?.length > 0) {
template.services[s]?.volumes && template.services[s].volumes.length > 0 && template.services[s].volumes.forEach(v => volumes.add(v)) template.services[s]?.volumes && template.services[s].volumes.length > 0 && template.services[s].volumes.forEach(v => volumes.add(v))
} }

2
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "coolify", "name": "coolify",
"description": "An open-source & self-hostable Heroku / Netlify alternative.", "description": "An open-source & self-hostable Heroku / Netlify alternative.",
"version": "3.12.20", "version": "3.12.21",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": "github:coollabsio/coolify", "repository": "github:coollabsio/coolify",
"scripts": { "scripts": {