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

Merge branch 'next' into some-tweaks

Browse Source
This commit is contained in:
Kaname 2022-09-10 17:14:44 +00:00
commit b1bb508554
10 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,7 +556,6 @@ export function checkPnpm(installCommand = null, buildCommand = null, startComma
);
}
export async function buildImage({
applicationId,
tag,
@ -677,8 +676,6 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
secrets,
pullmergeRequestId
} = data;
const isPnpm = checkPnpm(installCommand, buildCommand);
const Dockerfile: Array<string> = [];
Dockerfile.push(`FROM ${imageForBuild}`);

1
apps/api/src/lib/buildPacks/docker.ts
View File

@ -28,6 +28,7 @@ export default async function (data) {
if (secrets.length > 0) {
secrets.forEach((secret) => {
if (secret.isBuildSecret) {
// TODO: fix secrets
if (
(pullmergeRequestId && secret.isPRMRSecret) ||
(!pullmergeRequestId && !secret.isPRMRSecret)

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

@ -655,7 +655,7 @@ async function startLanguageToolService(request: FastifyRequest<ServiceStartStop
image: config.languagetool.image,
environment: config.languagetool.environmentVariables,
...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
volumes: config.languagetool,
volumes: config.languagetool.volumes,
labels: makeLabelForServices('languagetool'),
...defaultComposeConfiguration(network),
}
@ -710,7 +710,7 @@ async function startN8nService(request: FastifyRequest<ServiceStartStop>) {
[id]: {
container_name: id,
image: config.n8n.image,
volumes: config.n8n,
volumes: config.n8n.volumes,
environment: config.n8n.environmentVariables,
labels: makeLabelForServices('n8n'),
...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),

2
apps/api/src/routes/api/v1/handlers.ts
View File

@ -26,7 +26,7 @@ export async function cleanupManually(request: FastifyRequest) {
}
export async function checkUpdate(request: FastifyRequest) {
try {
const isStaging = request.hostname === 'staging.coolify.io'
const isStaging = request.hostname === 'staging.coolify.io' || request.hostname === 'arm.coolify.io'
const currentVersion = version;
const { data: versions } = await axios.get(
`https://get.coollabs.io/versions.json?appId=${process.env['COOLIFY_APP_ID']}&version=${currentVersion}`

2
apps/ui/src/routes/applications/[id]/__layout.svelte
View File

@ -107,7 +107,7 @@
$status.application.initialLoading = true;
try {
await del(`/applications/${id}`, { id, force });
return await goto(`/`, { replaceState: true });
return await window.location.assign(`/`);
} catch (error) {
if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid`)) {
forceDelete = true;

1
apps/ui/src/routes/applications/[id]/index.svelte
View File

@ -220,7 +220,6 @@
loading = true;
try {
nonWWWDomain = application.fqdn && getDomain(application.fqdn).replace(/^www\./, '');
console.log({debug: nonWWWDomain})
if (application.deploymentType)
application.deploymentType = application.deploymentType.toLowerCase();
!isBot &&

2
apps/ui/src/routes/databases/[id]/__layout.svelte
View File

@ -77,7 +77,7 @@
$status.database.initialLoading = true;
try {
await del(`/databases/${database.id}`, { id: database.id, force });
return await goto('/', { replaceState: true });
return await window.location.assign('/');
} catch (error) {
return errorNotification(error);
} finally {

2
apps/ui/src/routes/databases/[id]/logs/index.svelte
View File

@ -112,7 +112,7 @@
<button
id="follow"
on:click={followBuild}
class="bg-transparent btn btn-sm"
class="bg-transparent btn btn-sm btn-link"
class:text-green-500={followingLogs}
>
<svg

2
apps/ui/src/routes/services/[id]/__layout.svelte
View File

@ -86,7 +86,7 @@
if (service.type && $status.service.isRunning)
await post(`/services/${service.id}/${service.type}/stop`, {});
await del(`/services/${service.id}`, { id: service.id });
return await goto(`/`, { replaceState: true });
return await window.location.assign(`/`);
} catch (error) {
return errorNotification(error);
} finally {

2
apps/ui/src/routes/services/[id]/logs/index.svelte
View File

@ -128,7 +128,7 @@
<button
id="follow"
on:click={followBuild}
class="bg-transparent btn btn-sm"
class="bg-transparent btn btn-sm btn-link"
class:text-green-500={followingLogs}
>
<svg