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

Merge pull request #733 from coollabsio/next

Browse Source 
v3.11.10
This commit is contained in:
Andras Bacsai 2022-11-16 14:24:54 +01:00 committed by GitHub
commit eca58097ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ import { day } from './dayjs';
import { saveBuildLog } from './buildPacks/common'; import { saveBuildLog } from './buildPacks/common';
import { scheduler } from './scheduler'; import { scheduler } from './scheduler';
export const version = '3.11.9'; export const version = '3.11.10';
export const isDev = process.env.NODE_ENV === 'development'; export const isDev = process.env.NODE_ENV === 'development';
const algorithm = 'aes-256-ctr'; const algorithm = 'aes-256-ctr';

8
apps/api/src/routes/api/v1/services/handlers.ts
View File

@ -82,14 +82,18 @@ export async function getServiceStatus(request: FastifyRequest<OnlyId>) {
if (containersArray.length > 0 && containersArray[0] !== '') { if (containersArray.length > 0 && containersArray[0] !== '') {
const templates = await getTemplates(); const templates = await getTemplates();
let template = templates.find(t => t.type === service.type); let template = templates.find(t => t.type === service.type);
template = JSON.parse(JSON.stringify(template).replaceAll('$$id', service.id)); console.log(service.type)
const templateStr = JSON.stringify(template)
if (templateStr) {
template = JSON.parse(templateStr.replaceAll('$$id', service.id));
}
for (const container of containersArray) { for (const container of containersArray) {
let isRunning = false; let isRunning = false;
let isExited = false; let isExited = false;
let isRestarting = false; let isRestarting = false;
let isExcluded = false; let isExcluded = false;
const containerObj = JSON.parse(container); const containerObj = JSON.parse(container);
const exclude = template.services[containerObj.Names]?.exclude; const exclude = template?.services[containerObj.Names]?.exclude;
if (exclude) { if (exclude) {
payload[containerObj.Names] = { payload[containerObj.Names] = {
status: { status: {

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

@ -11,7 +11,7 @@ export function getAPIUrl() {
return `https://${CODESANDBOX_HOST.replace(/\$PORT/, '3001')}`; return `https://${CODESANDBOX_HOST.replace(/\$PORT/, '3001')}`;
} }
return dev return dev
? 'http://localhost:3001' ? `http://${window.location.hostname}:3001`
: 'http://localhost:3000'; : 'http://localhost:3000';
} }
export function getWebhookUrl(type: string) { export function getWebhookUrl(type: string) {

2
apps/ui/src/lib/store.ts
View File

@ -3,7 +3,7 @@ import cuid from 'cuid';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import { writable, readable, type Writable } from 'svelte/store'; import { writable, readable, type Writable } from 'svelte/store';
import { io as ioClient } from 'socket.io-client'; import { io as ioClient } from 'socket.io-client';
const socket = ioClient(dev ? 'http://localhost:3001' : '/', { auth: { token: Cookies.get('token') }, autoConnect: false }); const socket = ioClient(dev ? `http://${window.location.hostname}:3001` : '/', { auth: { token: Cookies.get('token') }, autoConnect: false });
export const io = socket; export const io = socket;
interface AppSession { interface AppSession {

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.11.9", "version": "3.11.10",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": "github:coollabsio/coolify", "repository": "github:coollabsio/coolify",
"scripts": { "scripts": {