From ed8a6daeeae10d4fe7665d873ae501ad6af691be Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 2 Jun 2022 20:37:31 +0200 Subject: [PATCH 1/3] chore: version++ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 35224769f..f059ad2aa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coolify", "description": "An open-source & self-hostable Heroku / Netlify alternative.", - "version": "2.9.5", + "version": "2.9.6", "license": "AGPL-3.0", "scripts": { "dev": "docker-compose -f docker-compose-dev.yaml up -d && cross-env NODE_ENV=development & svelte-kit dev --host 0.0.0.0", From 34bb9f301fcf127a447e74caffa5528f217afa1d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 2 Jun 2022 20:37:45 +0200 Subject: [PATCH 2/3] fix: Fider changed an env variable name --- src/routes/services/[id]/fider/start.json.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/services/[id]/fider/start.json.ts b/src/routes/services/[id]/fider/start.json.ts index 51e45ec3f..2adf53738 100644 --- a/src/routes/services/[id]/fider/start.json.ts +++ b/src/routes/services/[id]/fider/start.json.ts @@ -59,7 +59,7 @@ export const post: RequestHandler = async (event) => { fider: { image: `${image}:${version}`, environmentVariables: { - HOST_DOMAIN: domain, + BASE_URL: domain, DATABASE_URL: `postgresql://${postgresqlUser}:${postgresqlPassword}@${id}-postgresql:5432/${postgresqlDatabase}?sslmode=disable`, JWT_SECRET: `${jwtSecret.replace(/\$/g, '$$$')}`, EMAIL_NOREPLY: emailNoreply, From b081743f5424a13cdfc816c36acfa0a504b89072 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 2 Jun 2022 21:59:51 +0200 Subject: [PATCH 3/3] fix: pnpm command --- src/lib/buildPacks/nestjs.ts | 3 +-- src/lib/buildPacks/nextjs.ts | 3 +-- src/lib/buildPacks/node.ts | 3 +-- src/lib/buildPacks/nuxtjs.ts | 3 +-- src/lib/docker.ts | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/lib/buildPacks/nestjs.ts b/src/lib/buildPacks/nestjs.ts index b0bb6ba89..9486c9e8e 100644 --- a/src/lib/buildPacks/nestjs.ts +++ b/src/lib/buildPacks/nestjs.ts @@ -10,8 +10,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push('WORKDIR /app'); Dockerfile.push(`LABEL coolify.buildId=${buildId}`); if (isPnpm) { - Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm'); - Dockerfile.push('RUN pnpm add -g pnpm'); + Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7'); } Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${baseDirectory || ''} ./`); diff --git a/src/lib/buildPacks/nextjs.ts b/src/lib/buildPacks/nextjs.ts index 77f5bc5f8..5ebb30410 100644 --- a/src/lib/buildPacks/nextjs.ts +++ b/src/lib/buildPacks/nextjs.ts @@ -35,8 +35,7 @@ const createDockerfile = async (data, image): Promise => { }); } if (isPnpm) { - Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm'); - Dockerfile.push('RUN pnpm add -g pnpm'); + Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7'); } Dockerfile.push(`COPY .${baseDirectory || ''} ./`); Dockerfile.push(`RUN ${installCommand}`); diff --git a/src/lib/buildPacks/node.ts b/src/lib/buildPacks/node.ts index 9d8e643ef..46043593b 100644 --- a/src/lib/buildPacks/node.ts +++ b/src/lib/buildPacks/node.ts @@ -36,8 +36,7 @@ const createDockerfile = async (data, image): Promise => { }); } if (isPnpm) { - Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm'); - Dockerfile.push('RUN pnpm add -g pnpm'); + Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7'); } Dockerfile.push(`COPY .${baseDirectory || ''} ./`); Dockerfile.push(`RUN ${installCommand}`); diff --git a/src/lib/buildPacks/nuxtjs.ts b/src/lib/buildPacks/nuxtjs.ts index 9cd7e9674..e1fded7f2 100644 --- a/src/lib/buildPacks/nuxtjs.ts +++ b/src/lib/buildPacks/nuxtjs.ts @@ -35,8 +35,7 @@ const createDockerfile = async (data, image): Promise => { }); } if (isPnpm) { - Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm'); - Dockerfile.push('RUN pnpm add -g pnpm'); + Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7'); } Dockerfile.push(`COPY .${baseDirectory || ''} ./`); Dockerfile.push(`RUN ${installCommand}`); diff --git a/src/lib/docker.ts b/src/lib/docker.ts index 0b60a4ed9..864b32b62 100644 --- a/src/lib/docker.ts +++ b/src/lib/docker.ts @@ -66,8 +66,7 @@ export async function buildCacheImageWithNode(data, imageForBuild) { }); } if (isPnpm) { - Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm'); - Dockerfile.push('RUN pnpm add -g pnpm'); + Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7'); } if (installCommand) { Dockerfile.push(`COPY .${baseDirectory || ''}/package.json ./`);