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

Merge pull request #544 from coollabsio/next

Browse Source 
v3.5.1
This commit is contained in:
Andras Bacsai 2022-08-17 13:43:24 +02:00 committed by GitHub
commit 7a61ade4a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -30,7 +30,8 @@ RUN mkdir -p ~/.docker/cli-plugins/
# https://download.docker.com/linux/static/stable/ # https://download.docker.com/linux/static/stable/
RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-20.10.9 -o /usr/bin/docker RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-20.10.9 -o /usr/bin/docker
# https://github.com/docker/compose/releases # https://github.com/docker/compose/releases
RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.7.0 -o ~/.docker/cli-plugins/docker-compose # Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.6.1 -o ~/.docker/cli-plugins/docker-compose
RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker
RUN (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack) RUN (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack)

4
apps/api/src/jobs/deployApplication.ts
View File

@ -255,11 +255,11 @@ import * as buildpacks from '../lib/buildPacks';
secrets.forEach((secret) => { secrets.forEach((secret) => {
if (pullmergeRequestId) { if (pullmergeRequestId) {
if (secret.isPRMRSecret) { if (secret.isPRMRSecret) {
envs.push(`${secret.name}='${secret.value}'`); envs.push(`${secret.name}=${secret.value}`);
} }
} else { } else {
if (!secret.isPRMRSecret) { if (!secret.isPRMRSecret) {
envs.push(`${secret.name}='${secret.value}'`); envs.push(`${secret.name}=${secret.value}`);
} }
} }
}); });

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

@ -17,7 +17,7 @@ import { checkContainer, removeContainer } from './docker';
import { day } from './dayjs'; import { day } from './dayjs';
import * as serviceFields from './serviceFields' import * as serviceFields from './serviceFields'
export const version = '3.5.0'; export const version = '3.5.1';
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';

5
apps/api/src/routes/api/v1/applications/handlers.ts
View File

@ -657,13 +657,14 @@ export async function saveSecret(request: FastifyRequest<SaveSecret>, reply: Fas
if (found) { if (found) {
throw { status: 500, message: `Secret ${name} already exists.` } throw { status: 500, message: `Secret ${name} already exists.` }
} else { } else {
value = encrypt(value); value = encrypt(value.trim());
console.log({value})
await prisma.secret.create({ await prisma.secret.create({
data: { name, value, isBuildSecret, isPRMRSecret, application: { connect: { id } } } data: { name, value, isBuildSecret, isPRMRSecret, application: { connect: { id } } }
}); });
} }
} else { } else {
value = encrypt(value); value = encrypt(value.trim());
const found = await prisma.secret.findFirst({ where: { applicationId: id, name, isPRMRSecret } }); const found = await prisma.secret.findFirst({ where: { applicationId: id, name, isPRMRSecret } });
if (found) { if (found) {

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

@ -458,13 +458,13 @@ export async function saveServiceSecret(request: FastifyRequest<SaveServiceSecre
if (found) { if (found) {
throw `Secret ${name} already exists.` throw `Secret ${name} already exists.`
} else { } else {
value = encrypt(value); value = encrypt(value.trim());
await prisma.serviceSecret.create({ await prisma.serviceSecret.create({
data: { name, value, service: { connect: { id } } } data: { name, value, service: { connect: { id } } }
}); });
} }
} else { } else {
value = encrypt(value); value = encrypt(value.trim());
const found = await prisma.serviceSecret.findFirst({ where: { serviceId: id, name } }); const found = await prisma.serviceSecret.findFirst({ where: { serviceId: id, name } });
if (found) { if (found) {

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