Compare commits

...

7 Commits

Author SHA1 Message Date
Andras Bacsai
72ceeff022 Merge pull request #255 from coollabsio/v2.2.5
v2.2.5
2022-03-31 17:47:46 +02:00
Andras Bacsai
54d65ec011 chore: Version++ 2022-03-31 17:45:20 +02:00
Andras Bacsai
96aef5c4a6 fix: registration enabled/disabled 2022-03-31 17:45:04 +02:00
Andras Bacsai
7b64166fb0 Merge pull request #253 from coollabsio/v2.2.4
v2.2.4
2022-03-31 15:45:37 +02:00
Andras Bacsai
1f5908e0b8 fix: No need to dashify anymore 2022-03-31 15:42:15 +02:00
Andras Bacsai
a4562d18b6 chore: version++ 2022-03-31 15:41:02 +02:00
Andras Bacsai
875e232199 fix: Gitlab repo url 2022-03-31 15:40:26 +02:00
4 changed files with 5 additions and 13 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "coolify",
"description": "An open-source & self-hostable Heroku / Netlify alternative.",
"version": "2.2.3",
"version": "2.2.5",
"license": "AGPL-3.0",
"scripts": {
"dev": "docker-compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev",

View File

@@ -129,9 +129,8 @@ export const removeDestinationDocker = async ({ id, engine }) => {
};
export const createDirectories = async ({ repository, buildId }) => {
const dashedRepository = dashify(repository);
const repodir = `/tmp/build-sources/${dashedRepository}/`;
const workdir = `/tmp/build-sources/${dashedRepository}/${buildId}`;
const repodir = `/tmp/build-sources/${repository}/`;
const workdir = `/tmp/build-sources/${repository}/${buildId}`;
await asyncExecShell(`mkdir -p ${workdir}`);

View File

@@ -243,9 +243,7 @@
const url = `/applications/${id}/configuration/repository.json`;
try {
const repository = `${selected.group.full_path.replace('-personal', '')}/${
selected.project.name
}`;
const repository = selected.project.path_with_namespace;
await post(url, {
repository,
branch: selected.branch.name,

View File

@@ -66,15 +66,10 @@ export const post: RequestHandler = async (event) => {
const { fqdn, isRegistrationEnabled, dualCerts, minPort, maxPort } = await event.request.json();
try {
const { id } = await db.listSettings();
if (isRegistrationEnabled) {
await db.prisma.setting.update({ where: { id }, data: { isRegistrationEnabled } });
}
await db.prisma.setting.update({ where: { id }, data: { isRegistrationEnabled, dualCerts } });
if (fqdn) {
await db.prisma.setting.update({ where: { id }, data: { fqdn } });
}
if (dualCerts) {
await db.prisma.setting.update({ where: { id }, data: { dualCerts } });
}
if (minPort && maxPort) {
await db.prisma.setting.update({ where: { id }, data: { minPort, maxPort } });
}