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

Merge pull request #642 from coollabsio/next

Browse Source 
v3.10.11
This commit is contained in:
Andras Bacsai 2022-09-28 11:18:01 +02:00 committed by GitHub
commit 3dcc4faabb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ import { scheduler } from './scheduler';
import { supportedServiceTypesAndVersions } from './services/supportedVersions';
import { includeServices } from './services/common';
export const version = '3.10.10';
export const version = '3.10.11';
export const isDev = process.env.NODE_ENV === 'development';
const algorithm = 'aes-256-ctr';

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

@ -759,27 +759,32 @@
{/if}
{#if application.buildPack === 'docker'}
<div class="grid grid-cols-2 items-center pb-4">
<label for="dockerFileLocation"
class="mb-10"
<label for="dockerFileLocation" class=""
>Dockerfile Location <Explainer
explanation={"Should be absolute path, like <span class='text-settings font-bold'>/data/Dockerfile</span> or <span class='text-settings font-bold'>/Dockerfile.</span>"}
/></label
>
<div class="form-control w-full">
<input
class="w-full input"
disabled={isDisabled}
readonly={!$appSession.isAdmin}
name="dockerFileLocation"
id="dockerFileLocation"
bind:value={application.dockerFileLocation}
placeholder="default: /Dockerfile"
/>
<label class="label">
<span class="label-text-alt text-xs">Path: {application.baseDirectory.replace(/^\/$/,'')}{application.dockerFileLocation}</span>
</label>
</div>
class="w-full input"
disabled={isDisabled}
readonly={!$appSession.isAdmin}
name="dockerFileLocation"
id="dockerFileLocation"
bind:value={application.dockerFileLocation}
placeholder="default: /Dockerfile"
/>
{#if application.baseDirectory}
<label class="label">
<span class="label-text-alt text-xs"
>Path: {application.baseDirectory.replace(
/^\/$/,
''
)}{application.dockerFileLocation}</span
>
</label>
{/if}
</div>
</div>
{/if}
{#if !notNodeDeployments.includes(application.buildPack)}

6
apps/ui/src/routes/index.svelte
View File

@ -127,15 +127,15 @@
async function getStatus(resources: any, force: boolean = false) {
const { id, buildPack, dualCerts, type } = resources;
if (buildPack && applications.length > 10 && !force) {
if (buildPack && applications.length + filtered.otherApplications.length > 10 && !force) {
noInitialStatus.applications = true;
return;
}
if (type && services.length > 10 && !force) {
if (type && services.length + filtered.otherServices.length > 10 && !force) {
noInitialStatus.services = true;
return;
}
if (databases.length > 10 && !force) {
if (databases.length + filtered.otherDatabases.length > 10 && !force) {
noInitialStatus.databases = true;
return;
}

1
apps/ui/src/routes/services/[id]/_Services/_Hasura.svelte
View File

@ -19,6 +19,7 @@
disabled
/>
</div>
<div class="lg:px-10 px-2 py-4">Hasura Console is <span class="text-warning">not enabled by default</span> for security reasons. <br>To enable it, add the following secret:<br><br> <code>HASURA_GRAPHQL_ENABLE_CONSOLE=true</code></div>
<div class="flex space-x-1 py-5 font-bold">
<div class="title">PostgreSQL</div>

2
package.json
View File

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