ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2026-02-01 20:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
Andras Bacsai
2022-02-21 12:46:08 +01:00
parent add441675d c49b34942f
commit 980d8d374f
10 changed files with 146 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/routes/applications/[id]/configuration/buildpack.svelte
View File

@@ -34,7 +34,7 @@
import { page, session } from '$app/stores';
import { get } from '$lib/api';
import { errorNotification } from '$lib/form';
import { browser } from '$app/env';
import { gitTokens } from '$lib/store';
let scanning = true;
let foundConfig = null;
@@ -62,7 +62,7 @@
try {
if (type === 'gitlab') {
const files = await get(`${apiUrl}/v4/projects/${projectId}/repository/tree`, {
Authorization: `Bearer ${$session.gitlabToken}`
Authorization: `Bearer ${$gitTokens.gitlabToken}`
});
const packageJson = files.find(
(file) => file.name === 'package.json' && file.type === 'blob'
@@ -89,7 +89,7 @@
const data = await get(
`${apiUrl}/v4/projects/${projectId}/repository/files/${path}/raw?ref=${branch}`,
{
Authorization: `Bearer ${$session.gitlabToken}`
Authorization: `Bearer ${$gitTokens.gitlabToken}`
}
);
const json = JSON.parse(data) || {};
@@ -105,7 +105,7 @@
}
} else if (type === 'github') {
const files = await get(`${apiUrl}/repos/${repository}/contents?ref=${branch}`, {
Authorization: `Bearer ${$session.ghToken}`,
Authorization: `Bearer ${$gitTokens.githubToken}`,
Accept: 'application/vnd.github.v2.json'
});
const packageJson = files.find(
@@ -130,7 +130,7 @@
foundConfig.buildPack = 'docker';
} else if (packageJson) {
const data = await get(`${packageJson.git_url}`, {
Authorization: `Bearer ${$session.ghToken}`,
Authorization: `Bearer ${$gitTokens.githubToken}`,
Accept: 'application/vnd.github.v2.raw'
});
const json = JSON.parse(data) || {};