From 9b00d177efa9553d43e3c88ece5ba90aeb87d8f4 Mon Sep 17 00:00:00 2001
From: Hemang Joshi <hemangjoshi37a@gmail.com>
Date: Wed, 22 Feb 2023 16:21:32 +0530
Subject: [PATCH 1/7] added `star-history`

added `star-history`
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 4986cd150..3628d68fd 100644
--- a/README.md
+++ b/README.md
@@ -153,3 +153,6 @@ Support this project with your organization. Your logo will show up here with a
 
 <a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=coollabsio/coolify&type=Date)](https://star-history.com/#coollabsio/coolify&Date)

From 1d04ef99bbf06fe05d49caece930766e252189dc Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date: Fri, 24 Feb 2023 11:24:55 +0900
Subject: [PATCH 2/7] fix typo in _GitlabRepositories.svelte

occured -> occurred
---
 .../applications/[id]/configuration/_GitlabRepositories.svelte  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte b/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
index 737fc426f..97db0ba07 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
@@ -406,7 +406,7 @@
 		>
 		{#if tryAgain}
 			<div class="p-5">
-				An error occured during authenticating with GitLab. Please check your GitLab Source
+				An error occurred during authenticating with GitLab. Please check your GitLab Source
 				configuration <a href={`/sources/${application.gitSource.id}`}>here.</a>
 			</div>
 			<button

From 120308638fde049bbc0d23229fc08cd170715cca Mon Sep 17 00:00:00 2001
From: Daya Adianto <addianto@users.noreply.github.com>
Date: Sat, 25 Feb 2023 17:21:02 +0700
Subject: [PATCH 3/7] fix: set PACK_VERSION to 0.27.0

This commit removes the `v` prefix in the version identifier assigned to
PACK_VERSION build argument. The `pack` script actually available on
Coolify's CDN, but named without `v` prefix in the script's version identifier.

Related issue: #689, which reported that the `pack` script in the
container image is a HTML 404 file instead of the actual `pack`
executable.
---
 Dockerfile     | 4 ++--
 Dockerfile-dev | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6638bb202..adcbee05b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@ ARG DOCKER_VERSION=20.10.18
 # Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
 ARG DOCKER_COMPOSE_VERSION=2.6.1
 # https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=v0.27.0
+ARG PACK_VERSION=0.27.0
 
 RUN apt update && apt -y install --no-install-recommends ca-certificates git git-lfs openssh-client curl jq cmake sqlite3 openssl psmisc python3
 RUN apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/{apt,dpkg,cache,log}/
@@ -50,4 +50,4 @@ RUN pnpm install -p
 
 EXPOSE 3000
 ENV CHECKPOINT_DISABLE=1
-CMD pnpm start
\ No newline at end of file
+CMD pnpm start
diff --git a/Dockerfile-dev b/Dockerfile-dev
index 198307656..13b3a8560 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -9,7 +9,7 @@ ARG DOCKER_VERSION=20.10.18
 # Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
 ARG DOCKER_COMPOSE_VERSION=2.6.1
 # https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=v0.27.0
+ARG PACK_VERSION=0.27.0
 WORKDIR /app
 
 RUN npm --no-update-notifier --no-fund --global install pnpm@${PNPM_VERSION}
@@ -28,4 +28,4 @@ RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/pack-$PACK_VERSION -o /
 RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack
 
 EXPOSE 3000
-ENV CHECKPOINT_DISABLE=1
\ No newline at end of file
+ENV CHECKPOINT_DISABLE=1

From 6f15cc2dbcc1b6d888cb8942278b8a274152cef1 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 2 Mar 2023 16:52:55 +0100
Subject: [PATCH 4/7] fix: base directory not found

---
 apps/api/src/lib/buildPacks/gatsby.ts | 2 +-
 apps/api/src/lib/buildPacks/nestjs.ts | 2 +-
 apps/api/src/lib/buildPacks/nextjs.ts | 2 +-
 apps/api/src/lib/buildPacks/nuxtjs.ts | 2 +-
 apps/api/src/lib/buildPacks/react.ts  | 2 +-
 apps/api/src/lib/buildPacks/static.ts | 2 +-
 apps/api/src/lib/buildPacks/svelte.ts | 2 +-
 apps/api/src/lib/buildPacks/vuejs.ts  | 2 +-
 apps/api/src/lib/common.ts            | 2 +-
 package.json                          | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/api/src/lib/buildPacks/gatsby.ts b/apps/api/src/lib/buildPacks/gatsby.ts
index fbb0a933f..e630518cb 100644
--- a/apps/api/src/lib/buildPacks/gatsby.ts
+++ b/apps/api/src/lib/buildPacks/gatsby.ts
@@ -8,7 +8,7 @@ const createDockerfile = async (data, imageforBuild): Promise<void> => {
 	Dockerfile.push(`FROM ${imageforBuild}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/ ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
diff --git a/apps/api/src/lib/buildPacks/nestjs.ts b/apps/api/src/lib/buildPacks/nestjs.ts
index 90c99301b..88b48e6fe 100644
--- a/apps/api/src/lib/buildPacks/nestjs.ts
+++ b/apps/api/src/lib/buildPacks/nestjs.ts
@@ -12,7 +12,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	if (isPnpm) {
 		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 || ''} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/ ./`);
 
 	Dockerfile.push(`EXPOSE ${port}`);
 	Dockerfile.push(`CMD ${startCommand}`);
diff --git a/apps/api/src/lib/buildPacks/nextjs.ts b/apps/api/src/lib/buildPacks/nextjs.ts
index 957dc5bce..cc7fe36b4 100644
--- a/apps/api/src/lib/buildPacks/nextjs.ts
+++ b/apps/api/src/lib/buildPacks/nextjs.ts
@@ -42,7 +42,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		if (baseImage?.includes('nginx')) {
 			Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 		}
-		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/ ./`);
 		Dockerfile.push(`EXPOSE 80`);
 	}
 
diff --git a/apps/api/src/lib/buildPacks/nuxtjs.ts b/apps/api/src/lib/buildPacks/nuxtjs.ts
index 957dc5bce..cc7fe36b4 100644
--- a/apps/api/src/lib/buildPacks/nuxtjs.ts
+++ b/apps/api/src/lib/buildPacks/nuxtjs.ts
@@ -42,7 +42,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		if (baseImage?.includes('nginx')) {
 			Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 		}
-		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/ ./`);
 		Dockerfile.push(`EXPOSE 80`);
 	}
 
diff --git a/apps/api/src/lib/buildPacks/react.ts b/apps/api/src/lib/buildPacks/react.ts
index e85704d3f..d47eb5847 100644
--- a/apps/api/src/lib/buildPacks/react.ts
+++ b/apps/api/src/lib/buildPacks/react.ts
@@ -8,7 +8,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	Dockerfile.push('WORKDIR /app');
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/ ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
diff --git a/apps/api/src/lib/buildPacks/static.ts b/apps/api/src/lib/buildPacks/static.ts
index 19b13cef3..1a9916082 100644
--- a/apps/api/src/lib/buildPacks/static.ts
+++ b/apps/api/src/lib/buildPacks/static.ts
@@ -31,7 +31,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		});
 	}
 	if (buildCommand) {
-		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/ ./`);
 	} else {
 		Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	}
diff --git a/apps/api/src/lib/buildPacks/svelte.ts b/apps/api/src/lib/buildPacks/svelte.ts
index 56fc12d7a..74e377657 100644
--- a/apps/api/src/lib/buildPacks/svelte.ts
+++ b/apps/api/src/lib/buildPacks/svelte.ts
@@ -8,7 +8,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/ ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
diff --git a/apps/api/src/lib/buildPacks/vuejs.ts b/apps/api/src/lib/buildPacks/vuejs.ts
index 56fc12d7a..74e377657 100644
--- a/apps/api/src/lib/buildPacks/vuejs.ts
+++ b/apps/api/src/lib/buildPacks/vuejs.ts
@@ -8,7 +8,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/ ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index ab90b3a53..a3c754f15 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -19,7 +19,7 @@ import { saveBuildLog, saveDockerRegistryCredentials } from './buildPacks/common
 import { scheduler } from './scheduler';
 import type { ExecaChildProcess } from 'execa';
 
-export const version = '3.12.21';
+export const version = '3.12.22';
 export const isDev = process.env.NODE_ENV === 'development';
 export const proxyPort = process.env.COOLIFY_PROXY_PORT;
 export const proxySecurePort = process.env.COOLIFY_PROXY_SECURE_PORT;
diff --git a/package.json b/package.json
index 42b63505c..31e009004 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.12.21",
+  "version": "3.12.22",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {

From 9dfde11e353dad975747842fdf2aedbfe524b9a0 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 2 Mar 2023 16:56:44 +0100
Subject: [PATCH 5/7] possible fix: vaultwarden

---
 apps/ui/src/routes/services/[id]/_Storage.svelte | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/ui/src/routes/services/[id]/_Storage.svelte b/apps/ui/src/routes/services/[id]/_Storage.svelte
index 7a9e3368b..ae540becd 100644
--- a/apps/ui/src/routes/services/[id]/_Storage.svelte
+++ b/apps/ui/src/routes/services/[id]/_Storage.svelte
@@ -86,7 +86,7 @@
 					readonly
 					class="w-full"
 					value={`${
-						services.find((s) => s.id === storage.containerId).name || storage.containerId
+						services.find((s) => s.id === storage.containerId)?.name || storage.containerId
 					}`}
 				/>
 			</div>
@@ -111,19 +111,18 @@
 							name="containerId"
 							class="w-full lg:w-64"
 							disabled={storage.predefined}
-							readonly={storage.predefined}
 							bind:value={storage.containerId}
 						>
 							{#if services.length === 1}
 								{#if services[0].name}
-									<option selected value={services[0].id}>{services[0].name}</option>
+									<option selected value={services[0].id}>{services[0]?.name}</option>
 								{:else}
 									<option selected value={services[0]}>{services[0]}</option>
 								{/if}
 							{:else}
 								{#each services as service}
 									{#if service.name}
-										<option value={service.id}>{service.name}</option>
+										<option value={service.id}>{service?.name}</option>
 									{:else}
 										<option value={service}>{service}</option>
 									{/if}
@@ -157,7 +156,7 @@
 				disabled
 				readonly
 				class="w-full"
-				value={`${services.find((s) => s.id === storage.containerId).name || storage.containerId}`}
+				value={`${services.find((s) => s.id === storage.containerId)?.name || storage.containerId}`}
 			/>
 			<input disabled readonly class="w-full" value={`${storage.volumeName}:${storage.path}`} />
 			<button

From c0940f7a1914ce04fa47a9a8334a4daafa53ed43 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 2 Mar 2023 17:12:29 +0100
Subject: [PATCH 6/7] fix: cannot delete resource when you are not on root team

---
 apps/api/src/routes/api/v1/applications/handlers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts
index 8d8f3ead2..886b7bc88 100644
--- a/apps/api/src/routes/api/v1/applications/handlers.ts
+++ b/apps/api/src/routes/api/v1/applications/handlers.ts
@@ -736,7 +736,7 @@ export async function deleteApplication(
 			where: { id },
 			include: { destinationDocker: true, teams: true }
 		});
-		if (teamId !== '0' || !application.teams.some((team) => team.id === teamId)) {
+		if (teamId !== '0' && !application.teams.some((team) => team.id === teamId)) {
 			throw { status: 403, message: 'You are not allowed to delete this application.' };
 		}
 		if (application?.destinationDocker?.id && application.destinationDocker?.network) {

From 7f7eb12ded78ea14bd29d9a70e11f22872b44a86 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 2 Mar 2023 17:22:49 +0100
Subject: [PATCH 7/7] fix: empty port in docker compose

---
 apps/api/src/lib/buildPacks/compose.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/src/lib/buildPacks/compose.ts b/apps/api/src/lib/buildPacks/compose.ts
index 9e3ab12cb..439462231 100644
--- a/apps/api/src/lib/buildPacks/compose.ts
+++ b/apps/api/src/lib/buildPacks/compose.ts
@@ -95,7 +95,7 @@ export default async function (data) {
 				value['volumes'].push(volume);
 			}
 		}
-		if (dockerComposeConfiguration[key].port) {
+		if (dockerComposeConfiguration[key]?.port) {
 			value['expose'] = [dockerComposeConfiguration[key].port];
 		}
 		if (value['networks']?.length > 0) {