Merge pull request #230 from coollabsio/v2.1.0

v2.1.0

Dockerfile

@@ -1,4 +1,5 @@
 FROM node:16.14.0-alpine
+RUN apk add --no-cache g++ cmake make python3
 WORKDIR /app
 COPY package*.json .
 RUN yarn install

package.json

@@ -1,10 +1,10 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.0.29",
+	"version": "2.1.0",
 	"license": "AGPL-3.0",
 	"scripts": {
-		"dev": "docker-compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev --host 0.0.0.0",
+		"dev": "docker-compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev",
 		"dev:stop": "docker-compose -f docker-compose-dev.yaml down",
 		"dev:logs": "docker-compose -f docker-compose-dev.yaml logs -f --tail 10",
 		"studio": "npx prisma studio",
@@ -30,6 +30,7 @@
 		"@sveltejs/kit": "1.0.0-next.288",
 		"@types/bcrypt": "5.0.0",
 		"@types/js-cookie": "3.0.1",
+		"@types/js-yaml": "^4.0.5",
 		"@types/node": "17.0.21",
 		"@types/node-forge": "1.0.0",
 		"@typescript-eslint/eslint-plugin": "4.31.1",
@@ -50,6 +51,7 @@
 		"svelte": "3.46.4",
 		"svelte-check": "2.4.5",
 		"svelte-preprocess": "4.10.4",
+		"svelte-select": "^4.4.7",
 		"tailwindcss": "3.0.23",
 		"ts-node": "10.6.0",
 		"tslib": "2.3.1",

pnpm-lock.yaml

@@ -9,6 +9,7 @@ specifiers:
   '@sveltejs/kit': 1.0.0-next.288
   '@types/bcrypt': 5.0.0
   '@types/js-cookie': 3.0.1
+  '@types/js-yaml': ^4.0.5
   '@types/node': 17.0.21
   '@types/node-forge': 1.0.0
   '@typescript-eslint/eslint-plugin': 4.31.1
@@ -46,6 +47,7 @@ specifiers:
   svelte-check: 2.4.5
   svelte-kit-cookie-session: 2.1.2
   svelte-preprocess: 4.10.4
+  svelte-select: ^4.4.7
   tailwindcss: 3.0.23
   tailwindcss-scrollbar: ^0.1.0
   ts-node: 10.6.0
@@ -83,6 +85,7 @@ devDependencies:
   '@sveltejs/kit': 1.0.0-next.288_svelte@3.46.4
   '@types/bcrypt': 5.0.0
   '@types/js-cookie': 3.0.1
+  '@types/js-yaml': 4.0.5
   '@types/node': 17.0.21
   '@types/node-forge': 1.0.0
   '@typescript-eslint/eslint-plugin': 4.31.1_386b67ad67ef29c6a0ccaf3e9b60f945
@@ -103,6 +106,7 @@ devDependencies:
   svelte: 3.46.4
   svelte-check: 2.4.5_postcss@8.4.7+svelte@3.46.4
   svelte-preprocess: 4.10.4_e836cbb8ceb5bfaa7513362dd6308834
+  svelte-select: 4.4.7
   tailwindcss: 3.0.23_4b9e11f8e85900587b5e2272c5d4c20c
   ts-node: 10.6.0_e79e62fe450383fd2d418267dc75e645
   tslib: 2.3.1
@@ -535,6 +539,13 @@ packages:
       }
     dev: true
 
+  /@types/js-yaml/4.0.5:
+    resolution:
+      {
+        integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==
+      }
+    dev: true
+
   /@types/json-schema/7.0.9:
     resolution:
       {
@@ -5277,6 +5288,13 @@ packages:
       typescript: 4.6.2
     dev: true
 
+  /svelte-select/4.4.7:
+    resolution:
+      {
+        integrity: sha512-fIf9Z8rPI6F8naHZ9wjXT0Pv5gLyhdHAFkHFJnCfVVfELE8e82uOoF0xEVQP6Kir+b4Q5yOvNAzZ61WbSU6A0A==
+      }
+    dev: true
+
   /svelte/3.46.4:
     resolution:
       {

prisma/migrations/20220320141424_phpmodules/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Application" ADD COLUMN "phpModules" TEXT;

prisma/migrations/20220322135800_persistent_storage/migration.sql

@@ -0,0 +1,18 @@
+-- CreateTable
+CREATE TABLE "ApplicationPersistentStorage" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT NOT NULL,
+    "path" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ApplicationPersistentStorage_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ApplicationPersistentStorage_applicationId_key" ON "ApplicationPersistentStorage"("applicationId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ApplicationPersistentStorage_path_key" ON "ApplicationPersistentStorage"("path");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ApplicationPersistentStorage_applicationId_path_key" ON "ApplicationPersistentStorage"("applicationId", "path");

prisma/schema.prisma

@@ -72,9 +72,9 @@ model TeamInvitation {
 }
 
 model Application {
-  id                  String               @id @default(cuid())
+  id                  String                         @id @default(cuid())
   name                String
-  fqdn                String?              @unique
+  fqdn                String?                        @unique
   repository          String?
   configHash          String?
   branch              String?
@@ -86,15 +86,17 @@ model Application {
   startCommand        String?
   baseDirectory       String?
   publishDirectory    String?
-  createdAt           DateTime             @default(now())
-  updatedAt           DateTime             @updatedAt
+  phpModules          String?
+  createdAt           DateTime                       @default(now())
+  updatedAt           DateTime                       @updatedAt
   settings            ApplicationSettings?
   teams               Team[]
   destinationDockerId String?
-  destinationDocker   DestinationDocker?   @relation(fields: [destinationDockerId], references: [id])
+  destinationDocker   DestinationDocker?             @relation(fields: [destinationDockerId], references: [id])
   gitSourceId         String?
-  gitSource           GitSource?           @relation(fields: [gitSourceId], references: [id])
+  gitSource           GitSource?                     @relation(fields: [gitSourceId], references: [id])
   secrets             Secret[]
+  persistentStorage   ApplicationPersistentStorage[]
 }
 
 model ApplicationSettings {
@@ -109,6 +111,17 @@ model ApplicationSettings {
   updatedAt     DateTime    @updatedAt
 }
 
+model ApplicationPersistentStorage {
+  id            String      @id @default(cuid())
+  application   Application @relation(fields: [applicationId], references: [id])
+  applicationId String      @unique
+  path          String      @unique
+  createdAt     DateTime    @default(now())
+  updatedAt     DateTime    @updatedAt
+
+  @@unique([applicationId, path])
+}
+
 model Secret {
   id            String      @id @default(cuid())
   name          String

src/app.d.ts

@@ -7,7 +7,10 @@ declare namespace App {
 	}
 	interface Platform {}
 	interface Session extends SessionData {}
-	interface Stuff {}
+	interface Stuff {
+		application: any;
+		isRunning: boolean;
+	}
 }
 
 interface SessionData {

src/lib/buildPacks/common.ts

@@ -29,10 +29,10 @@ export function makeLabelForStandaloneApplication({
 		fqdn = `${protocol}://${pullmergeRequestId}.${domain}`;
 	}
 	return [
-		'--label coolify.managed=true',
-		`--label coolify.version=${version}`,
-		`--label coolify.type=standalone-application`,
-		`--label coolify.configuration=${base64Encode(
+		'coolify.managed=true',
+		`coolify.version=${version}`,
+		`coolify.type=standalone-application`,
+		`coolify.configuration=${base64Encode(
 			JSON.stringify({
 				applicationId,
 				fqdn,
@@ -84,7 +84,15 @@ export function makeLabelForServices(type) {
 }
 
 export const setDefaultConfiguration = async (data) => {
-	let { buildPack, port, installCommand, startCommand, buildCommand, publishDirectory } = data;
+	let {
+		buildPack,
+		port,
+		installCommand,
+		startCommand,
+		buildCommand,
+		publishDirectory,
+		baseDirectory
+	} = data;
 	const template = scanningTemplates[buildPack];
 	if (!port) {
 		port = template?.port || 3000;
@@ -97,6 +105,10 @@ export const setDefaultConfiguration = async (data) => {
 	if (!startCommand) startCommand = template?.startCommand || 'yarn start';
 	if (!buildCommand) buildCommand = template?.buildCommand || null;
 	if (!publishDirectory) publishDirectory = template?.publishDirectory || null;
+	if (baseDirectory) {
+		if (!baseDirectory.startsWith('/')) baseDirectory = `/${baseDirectory}`;
+		if (!baseDirectory.endsWith('/')) baseDirectory = `${baseDirectory}/`;
+	}
 
 	return {
 		buildPack,
@@ -104,7 +116,8 @@ export const setDefaultConfiguration = async (data) => {
 		installCommand,
 		startCommand,
 		buildCommand,
-		publishDirectory
+		publishDirectory,
+		baseDirectory
 	};
 };
 
@@ -122,6 +135,7 @@ export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, ap
         RewriteRule ^(.+)$ index.php [QSA,L]
         `
 			);
+			await fs.writeFile(`${workdir}/entrypoint.sh`, `chown -R 1000 /app`);
 			saveBuildLog({ line: 'Copied default configuration file for PHP.', buildId, applicationId });
 		} else if (staticDeployments.includes(buildPack)) {
 			await fs.writeFile(
@@ -129,27 +143,35 @@ export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, ap
 				`user  nginx;
             worker_processes  auto;
             
-            error_log  /var/log/nginx/error.log warn;
-            pid        /var/run/nginx.pid;
+            error_log  /docker.stdout;
+            pid        /run/nginx.pid;
             
             events {
                 worker_connections  1024;
             }
             
             http {
-                include       /etc/nginx/mime.types;
-            
-                access_log      off;
-                sendfile        on;
-                #tcp_nopush     on;
-                keepalive_timeout  65;
+				log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+				'$status $body_bytes_sent "$http_referer" '
+				'"$http_user_agent" "$http_x_forwarded_for"';
+
+                access_log  /docker.stdout main;
+
+				sendfile            on;
+				tcp_nopush          on;
+				tcp_nodelay         on;
+				keepalive_timeout   65;
+				types_hash_max_size 2048;
+
+			    include             /etc/nginx/mime.types;
+    			default_type        application/octet-stream;
     
                 server {
                     listen       80;
                     server_name  localhost;
                     
                     location / {
-                        root   /usr/share/nginx/html;
+                        root   /app;
                         index  index.html;
                         try_files $uri $uri/index.html $uri/ /index.html =404;
                     }
@@ -160,7 +182,7 @@ export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, ap
                     #
                     error_page   500 502 503 504  /50x.html;
                     location = /50x.html {
-                        root   /usr/share/nginx/html;
+                        root   /app;
                     }  
             
                 }
@@ -175,3 +197,11 @@ export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, ap
 		throw new Error(error);
 	}
 }
+
+export function checkPnpm(installCommand = null, buildCommand = null, startCommand = null) {
+	return (
+		installCommand?.includes('pnpm') ||
+		buildCommand?.includes('pnpm') ||
+		startCommand?.includes('pnpm')
+	);
+}

src/lib/buildPacks/docker.ts

@@ -16,6 +16,7 @@ export default async function ({
 		let file = `${workdir}/Dockerfile`;
 		if (baseDirectory) {
 			file = `${workdir}/${baseDirectory}/Dockerfile`;
+			workdir = `${workdir}/${baseDirectory}`;
 		}
 
 		const Dockerfile: Array<string> = (await fs.readFile(`${file}`, 'utf8'))

src/lib/buildPacks/gatsby.ts

@@ -6,17 +6,17 @@ const createDockerfile = async (data, imageforBuild): Promise<void> => {
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${imageforBuild}`);
-	Dockerfile.push('WORKDIR /usr/share/nginx/html');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.image=true`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'nginx:stable-alpine';
+		const image = 'webdevops/nginx:alpine';
 		const imageForBuild = 'node:lts';
 
 		await buildCacheImageWithNode(data, imageForBuild);

src/lib/buildPacks/nestjs.ts

@@ -7,15 +7,13 @@ const createDockerfile = async (data, image): Promise<void> => {
 	const isPnpm = startCommand.includes('pnpm');
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.image=true`);
 	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(
-		`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${baseDirectory || ''} ./`
-	);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${baseDirectory || ''} ./`);
 
 	Dockerfile.push(`EXPOSE ${port}`);
 	Dockerfile.push(`CMD ${startCommand}`);

src/lib/buildPacks/nextjs.ts

@@ -1,5 +1,6 @@
 import { buildImage } from '$lib/docker';
 import { promises as fs } from 'fs';
+import { checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
 	const {
@@ -13,12 +14,9 @@ const createDockerfile = async (data, image): Promise<void> => {
 		pullmergeRequestId
 	} = data;
 	const Dockerfile: Array<string> = [];
-	const isPnpm =
-		installCommand.includes('pnpm') ||
-		buildCommand.includes('pnpm') ||
-		startCommand.includes('pnpm');
+	const isPnpm = checkPnpm(installCommand, buildCommand, startCommand);
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.image=true`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
@@ -39,17 +37,9 @@ const createDockerfile = async (data, image): Promise<void> => {
 		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(`COPY ./${baseDirectory || ''}package*.json ./`);
-	try {
-		await fs.stat(`${workdir}/yarn.lock`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}yarn.lock ./`);
-	} catch (error) {}
-	try {
-		await fs.stat(`${workdir}/pnpm-lock.yaml`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}pnpm-lock.yaml ./`);
-	} catch (error) {}
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${installCommand}`);
-	Dockerfile.push(`COPY ./${baseDirectory || ''} ./`);
+
 	if (buildCommand) {
 		Dockerfile.push(`RUN ${buildCommand}`);
 	}

src/lib/buildPacks/node.ts

@@ -1,5 +1,6 @@
 import { buildImage } from '$lib/docker';
 import { promises as fs } from 'fs';
+import { checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
 	const {
@@ -13,12 +14,10 @@ const createDockerfile = async (data, image): Promise<void> => {
 		pullmergeRequestId
 	} = data;
 	const Dockerfile: Array<string> = [];
-	const isPnpm =
-		installCommand.includes('pnpm') ||
-		buildCommand.includes('pnpm') ||
-		startCommand.includes('pnpm');
+	const isPnpm = checkPnpm(installCommand, buildCommand, startCommand);
+
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.image=true`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
@@ -39,17 +38,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 		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(`COPY ./${baseDirectory || ''}package*.json ./`);
-	try {
-		await fs.stat(`${workdir}/yarn.lock`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}yarn.lock ./`);
-	} catch (error) {}
-	try {
-		await fs.stat(`${workdir}/pnpm-lock.yaml`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}pnpm-lock.yaml ./`);
-	} catch (error) {}
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${installCommand}`);
-	Dockerfile.push(`COPY ./${baseDirectory || ''} ./`);
 	if (buildCommand) {
 		Dockerfile.push(`RUN ${buildCommand}`);
 	}

src/lib/buildPacks/nuxtjs.ts

@@ -1,5 +1,6 @@
 import { buildImage } from '$lib/docker';
 import { promises as fs } from 'fs';
+import { checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
 	const {
@@ -13,12 +14,9 @@ const createDockerfile = async (data, image): Promise<void> => {
 		pullmergeRequestId
 	} = data;
 	const Dockerfile: Array<string> = [];
-	const isPnpm =
-		installCommand.includes('pnpm') ||
-		buildCommand.includes('pnpm') ||
-		startCommand.includes('pnpm');
+	const isPnpm = checkPnpm(installCommand, buildCommand, startCommand);
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.image=true`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
@@ -39,17 +37,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 		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(`COPY ./${baseDirectory || ''}package*.json ./`);
-	try {
-		await fs.stat(`${workdir}/yarn.lock`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}yarn.lock ./`);
-	} catch (error) {}
-	try {
-		await fs.stat(`${workdir}/pnpm-lock.yaml`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}pnpm-lock.yaml ./`);
-	} catch (error) {}
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${installCommand}`);
-	Dockerfile.push(`COPY ./${baseDirectory || ''} ./`);
 	if (buildCommand) {
 		Dockerfile.push(`RUN ${buildCommand}`);
 	}

src/lib/buildPacks/php.ts

@@ -4,21 +4,19 @@ import { promises as fs } from 'fs';
 const createDockerfile = async (data, image): Promise<void> => {
 	const { workdir, baseDirectory } = data;
 	const Dockerfile: Array<string> = [];
-
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push(`LABEL coolify.image=true`);
-	Dockerfile.push('RUN a2enmod rewrite');
-	Dockerfile.push('WORKDIR /var/www/html');
-	Dockerfile.push(`COPY ./${baseDirectory || ''} /var/www/html`);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`COPY .${baseDirectory || ''} /app`);
+	Dockerfile.push(`COPY /.htaccess .`);
+	Dockerfile.push(`COPY /entrypoint.sh /opt/docker/provision/entrypoint.d/30-entrypoint.sh`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["apache2-foreground"]');
-	Dockerfile.push('RUN chown -R www-data /var/www/html');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'php:apache';
+		const image = 'webdevops/php-nginx';
 		await createDockerfile(data, image);
 		await buildImage(data);
 	} catch (error) {

src/lib/buildPacks/react.ts

@@ -7,16 +7,16 @@ const createDockerfile = async (data, image): Promise<void> => {
 
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push(`LABEL coolify.image=true`);
-	Dockerfile.push('WORKDIR /usr/share/nginx/html');
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'nginx:stable-alpine';
+		const image = 'webdevops/nginx:alpine';
 		const imageForBuild = 'node:lts';
 		await buildCacheImageWithNode(data, imageForBuild);
 		await createDockerfile(data, image);

src/lib/buildPacks/rust.ts

@@ -7,23 +7,21 @@ const createDockerfile = async (data, image, name): Promise<void> => {
 	const { workdir, port, applicationId, tag } = data;
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.image=true`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/target target`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/target target`);
 	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/local/cargo /usr/local/cargo`);
 	Dockerfile.push(`COPY . .`);
 	Dockerfile.push(`RUN cargo build --release --bin ${name}`);
 	Dockerfile.push('FROM debian:buster-slim');
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(
 		`RUN apt-get update -y && apt-get install -y --no-install-recommends openssl libcurl4 ca-certificates && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*`
 	);
 	Dockerfile.push(`RUN update-ca-certificates`);
-	Dockerfile.push(
-		`COPY --from=${applicationId}:${tag}-cache /usr/src/app/target/release/${name} ${name}`
-	);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/target/release/${name} ${name}`);
 	Dockerfile.push(`EXPOSE ${port}`);
-	Dockerfile.push(`CMD ["/usr/src/app/${name}"]`);
+	Dockerfile.push(`CMD ["/app/${name}"]`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 

src/lib/buildPacks/static.ts

@@ -15,7 +15,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/share/nginx/html');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.image=true`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
@@ -33,20 +33,18 @@ const createDockerfile = async (data, image): Promise<void> => {
 		});
 	}
 	if (buildCommand) {
-		Dockerfile.push(
-			`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`
-		);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
 	} else {
-		Dockerfile.push(`COPY ./${baseDirectory || ''} ./`);
+		Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	}
+	Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'nginx:stable-alpine';
+		const image = 'webdevops/nginx:alpine';
 		const imageForBuild = 'node:lts';
 		if (data.buildCommand) await buildCacheImageWithNode(data, imageForBuild);
 		await createDockerfile(data, image);

src/lib/buildPacks/svelte.ts

@@ -6,17 +6,17 @@ const createDockerfile = async (data, image): Promise<void> => {
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/share/nginx/html');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.image=true`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'nginx:stable-alpine';
+		const image = 'webdevops/nginx:alpine';
 		const imageForBuild = 'node:lts';
 
 		await buildCacheImageWithNode(data, imageForBuild);

src/lib/buildPacks/vuejs.ts

@@ -6,17 +6,17 @@ const createDockerfile = async (data, image): Promise<void> => {
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/share/nginx/html');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.image=true`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'nginx:stable-alpine';
+		const image = 'webdevops/nginx:alpine';
 		const imageForBuild = 'node:lts';
 		await buildCacheImageWithNode(data, imageForBuild);
 		await createDockerfile(data, image);

src/lib/common.ts

@@ -69,9 +69,9 @@ export const isTeamIdTokenAvailable = (request) => {
 
 export const getTeam = (event) => {
 	const cookies = Cookie.parse(event.request.headers.get('cookie'));
-	if (cookies.teamId) {
+	if (cookies?.teamId) {
 		return cookies.teamId;
-	} else if (event.locals.session.data.teamId) {
+	} else if (event.locals.session.data?.teamId) {
 		return event.locals.session.data.teamId;
 	}
 	return null;

src/lib/components/common.ts

@@ -9,7 +9,16 @@ export const dateOptions: DateTimeFormatOptions = {
 	hour12: false
 };
 
-export const staticDeployments = ['react', 'vuejs', 'static', 'svelte', 'gatsby', 'php'];
+export const staticDeployments = [
+	'react',
+	'vuejs',
+	'static',
+	'svelte',
+	'gatsby',
+	'php',
+	'astro',
+	'eleventy'
+];
 export const notNodeDeployments = ['php', 'docker', 'rust'];
 
 export function getDomain(domain) {

src/lib/database/applications.ts

@@ -64,7 +64,9 @@ export async function removeApplication({ id, teamId }) {
 
 	await prisma.applicationSettings.deleteMany({ where: { application: { id } } });
 	await prisma.buildLog.deleteMany({ where: { applicationId: id } });
+	await prisma.build.deleteMany({ where: { applicationId: id } });
 	await prisma.secret.deleteMany({ where: { applicationId: id } });
+	await prisma.applicationPersistentStorage.deleteMany({ where: { applicationId: id } });
 	await prisma.application.deleteMany({ where: { id, teams: { some: { id: teamId } } } });
 }
 
@@ -79,17 +81,20 @@ export async function getApplicationWebhook({ projectId, branch }) {
 				secrets: true
 			}
 		});
-		if (application.gitSource?.githubApp?.clientSecret) {
+		if (!application) {
+			return null;
+		}
+		if (application?.gitSource?.githubApp?.clientSecret) {
 			application.gitSource.githubApp.clientSecret = decrypt(
 				application.gitSource.githubApp.clientSecret
 			);
 		}
-		if (application.gitSource?.githubApp?.webhookSecret) {
+		if (application?.gitSource?.githubApp?.webhookSecret) {
 			application.gitSource.githubApp.webhookSecret = decrypt(
 				application.gitSource.githubApp.webhookSecret
 			);
 		}
-		if (application.gitSource?.githubApp?.privateKey) {
+		if (application?.gitSource?.githubApp?.privateKey) {
 			application.gitSource.githubApp.privateKey = decrypt(
 				application.gitSource.githubApp.privateKey
 			);
@@ -130,7 +135,8 @@ export async function getApplication({ id, teamId }) {
 			destinationDocker: true,
 			settings: true,
 			gitSource: { include: { githubApp: true, gitlabApp: true } },
-			secrets: true
+			secrets: true,
+			persistentStorage: true
 		}
 	});
 
@@ -259,3 +265,7 @@ export async function createBuild({
 		}
 	});
 }
+
+export async function getPersistentStorage(id) {
+	return await prisma.applicationPersistentStorage.findMany({ where: { applicationId: id } });
+}

src/lib/docker.ts

@@ -1,5 +1,6 @@
 import Dockerode from 'dockerode';
 import { promises as fs } from 'fs';
+import { checkPnpm } from './buildPacks/common';
 import { saveBuildLog } from './common';
 
 export async function buildCacheImageWithNode(data, imageForBuild) {
@@ -16,10 +17,10 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 		secrets,
 		pullmergeRequestId
 	} = data;
-	const isPnpm = installCommand.includes('pnpm') || buildCommand.includes('pnpm');
+	const isPnpm = checkPnpm(installCommand, buildCommand);
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${imageForBuild}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.image=true`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
@@ -40,19 +41,10 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 		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(`COPY .${baseDirectory || ''} ./`);
 	if (installCommand) {
-		Dockerfile.push(`COPY ./${baseDirectory || ''}package*.json ./`);
-		try {
-			await fs.stat(`${workdir}/yarn.lock`);
-			Dockerfile.push(`COPY ./${baseDirectory || ''}yarn.lock ./`);
-		} catch (error) {}
-		try {
-			await fs.stat(`${workdir}/pnpm-lock.yaml`);
-			Dockerfile.push(`COPY ./${baseDirectory || ''}pnpm-lock.yaml ./`);
-		} catch (error) {}
 		Dockerfile.push(`RUN ${installCommand}`);
 	}
-	Dockerfile.push(`COPY ./${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${buildCommand}`);
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
 	await buildImage({ applicationId, tag, workdir, docker, buildId, isCache: true, debug });
@@ -73,14 +65,14 @@ export async function buildCacheImageWithCargo(data, imageForBuild) {
 	} = data;
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${imageForBuild} as planner-${applicationId}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push('RUN cargo install cargo-chef');
 	Dockerfile.push('COPY . .');
 	Dockerfile.push('RUN cargo chef prepare --recipe-path recipe.json');
 	Dockerfile.push(`FROM ${imageForBuild}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push('RUN cargo install cargo-chef');
-	Dockerfile.push(`COPY --from=planner-${applicationId} /usr/src/app/recipe.json recipe.json`);
+	Dockerfile.push(`COPY --from=planner-${applicationId} /app/recipe.json recipe.json`);
 	Dockerfile.push('RUN cargo chef cook --release --recipe-path recipe.json');
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
 	await buildImage({ applicationId, tag, workdir, docker, buildId, isCache: true, debug });

src/lib/importers/github.ts

@@ -45,6 +45,7 @@ export default async function ({
 		const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
 		return commit.replace('\n', '');
 	} catch (error) {
+		console.log({ error });
 		return ErrorHandler(error);
 	}
 }

src/lib/letsencrypt/index.ts

@@ -103,34 +103,38 @@ export async function generateSSLCerts() {
 		orderBy: { createdAt: 'desc' }
 	});
 	for (const application of applications) {
-		const {
-			fqdn,
-			id,
-			destinationDocker: { engine, network },
-			settings: { previews }
-		} = application;
-		const isRunning = await checkContainer(engine, id);
-		const domain = getDomain(fqdn);
-		const isHttps = fqdn.startsWith('https://');
-		if (isRunning) {
-			if (isHttps) ssls.push({ domain, id, isCoolify: false });
-		}
-		if (previews) {
-			const host = getEngine(engine);
-			const { stdout } = await asyncExecShell(
-				`DOCKER_HOST=${host} docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"`
-			);
-			const containers = stdout
-				.trim()
-				.split('\n')
-				.filter((a) => a)
-				.map((c) => c.replace(/"/g, ''));
-			if (containers.length > 0) {
-				for (const container of containers) {
-					let previewDomain = `${container.split('-')[1]}.${domain}`;
-					if (isHttps) ssls.push({ domain: previewDomain, id, isCoolify: false });
+		try {
+			const {
+				fqdn,
+				id,
+				destinationDocker: { engine, network },
+				settings: { previews }
+			} = application;
+			const isRunning = await checkContainer(engine, id);
+			const domain = getDomain(fqdn);
+			const isHttps = fqdn.startsWith('https://');
+			if (isRunning) {
+				if (isHttps) ssls.push({ domain, id, isCoolify: false });
+			}
+			if (previews) {
+				const host = getEngine(engine);
+				const { stdout } = await asyncExecShell(
+					`DOCKER_HOST=${host} docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"`
+				);
+				const containers = stdout
+					.trim()
+					.split('\n')
+					.filter((a) => a)
+					.map((c) => c.replace(/"/g, ''));
+				if (containers.length > 0) {
+					for (const container of containers) {
+						let previewDomain = `${container.split('-')[1]}.${domain}`;
+						if (isHttps) ssls.push({ domain: previewDomain, id, isCoolify: false });
+					}
 				}
 			}
+		} catch (error) {
+			console.log(`Error during generateSSLCerts with ${application.fqdn}: ${error}`);
 		}
 	}
 	const services = await db.prisma.service.findMany({
@@ -145,20 +149,24 @@ export async function generateSSLCerts() {
 	});
 
 	for (const service of services) {
-		const {
-			fqdn,
-			id,
-			type,
-			destinationDocker: { engine }
-		} = service;
-		const found = db.supportedServiceTypesAndVersions.find((a) => a.name === type);
-		if (found) {
-			const domain = getDomain(fqdn);
-			const isHttps = fqdn.startsWith('https://');
-			const isRunning = await checkContainer(engine, id);
-			if (isRunning) {
-				if (isHttps) ssls.push({ domain, id, isCoolify: false });
+		try {
+			const {
+				fqdn,
+				id,
+				type,
+				destinationDocker: { engine }
+			} = service;
+			const found = db.supportedServiceTypesAndVersions.find((a) => a.name === type);
+			if (found) {
+				const domain = getDomain(fqdn);
+				const isHttps = fqdn.startsWith('https://');
+				const isRunning = await checkContainer(engine, id);
+				if (isRunning) {
+					if (isHttps) ssls.push({ domain, id, isCoolify: false });
+				}
 			}
+		} catch (error) {
+			console.log(`Error during generateSSLCerts with ${service.fqdn}: ${error}`);
 		}
 	}
 	const { fqdn } = await db.prisma.setting.findFirst();

src/lib/queues/builder.ts

@@ -3,7 +3,14 @@ import fs from 'fs/promises';
 import * as buildpacks from '../buildPacks';
 import * as importers from '../importers';
 import { dockerInstance } from '../docker';
-import { asyncExecShell, createDirectories, getDomain, getEngine, saveBuildLog } from '../common';
+import {
+	asyncExecShell,
+	asyncSleep,
+	createDirectories,
+	getDomain,
+	getEngine,
+	saveBuildLog
+} from '../common';
 import * as db from '$lib/database';
 import { decrypt } from '$lib/crypto';
 import { sentry } from '$lib/common';
@@ -12,7 +19,7 @@ import {
 	makeLabelForStandaloneApplication,
 	setDefaultConfiguration
 } from '$lib/buildPacks/common';
-import { letsEncrypt } from '$lib/letsencrypt';
+import yaml from 'js-yaml';
 
 export default async function (job) {
 	/*
@@ -39,17 +46,34 @@ export default async function (job) {
 		publishDirectory,
 		projectId,
 		secrets,
+		phpModules,
 		type,
 		pullmergeRequestId = null,
 		sourceBranch = null,
-		settings
+		settings,
+		persistentStorage
 	} = job.data;
 	const { debug } = settings;
 
+	await asyncSleep(1000);
+
+	await db.prisma.build.updateMany({
+		where: {
+			status: 'queued',
+			id: { not: buildId },
+			applicationId,
+			createdAt: { lt: new Date(new Date().getTime() - 60 * 60 * 1000) }
+		},
+		data: { status: 'failed' }
+	});
 	let imageId = applicationId;
 	let domain = getDomain(fqdn);
-	const isHttps = fqdn.startsWith('https://');
-
+	let volumes =
+		persistentStorage?.map((storage) => {
+			return `${applicationId}${storage.path.replace(/\//gi, '-')}:${
+				buildPack !== 'docker' ? '/app' : ''
+			}${storage.path}`;
+		}) || [];
 	// Previews, we need to get the source branch and set subdomain
 	if (pullmergeRequestId) {
 		branch = sourceBranch;
@@ -67,17 +91,8 @@ export default async function (job) {
 		const docker = dockerInstance({ destinationDocker });
 		const host = getEngine(destinationDocker.engine);
 
-		const build = await db.createBuild({
-			id: buildId,
-			applicationId,
-			destinationDockerId: destinationDocker.id,
-			gitSourceId: gitSource.id,
-			githubAppId: gitSource.githubApp?.id,
-			gitlabAppId: gitSource.gitlabApp?.id,
-			type
-		});
-
-		const { workdir, repodir } = await createDirectories({ repository, buildId: build.id });
+		await db.prisma.build.update({ where: { id: buildId }, data: { status: 'running' } });
+		const { workdir, repodir } = await createDirectories({ repository, buildId });
 
 		const configuration = await setDefaultConfiguration(job.data);
 
@@ -87,6 +102,7 @@ export default async function (job) {
 		startCommand = configuration.startCommand;
 		buildCommand = configuration.buildCommand;
 		publishDirectory = configuration.publishDirectory;
+		baseDirectory = configuration.baseDirectory;
 
 		let commit = await importers[gitSource.type]({
 			applicationId,
@@ -97,19 +113,22 @@ export default async function (job) {
 			gitlabAppId: gitSource.gitlabApp?.id,
 			repository,
 			branch,
-			buildId: build.id,
+			buildId,
 			apiUrl: gitSource.apiUrl,
 			projectId,
 			deployKeyId: gitSource.gitlabApp?.deployKeyId || null,
 			privateSshKey: decrypt(gitSource.gitlabApp?.privateSshKey) || null
 		});
+		if (!commit) {
+			throw new Error('No commit found?');
+		}
 		let tag = commit.slice(0, 7);
 		if (pullmergeRequestId) {
 			tag = `${commit.slice(0, 7)}-${pullmergeRequestId}`;
 		}
 
 		try {
-			await db.prisma.build.update({ where: { id: build.id }, data: { commit } });
+			db.prisma.build.update({ where: { id: buildId }, data: { commit } });
 		} catch (err) {
 			console.log(err);
 		}
@@ -160,7 +179,7 @@ export default async function (job) {
 			await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId);
 			if (buildpacks[buildPack])
 				await buildpacks[buildPack]({
-					buildId: build.id,
+					buildId,
 					applicationId,
 					domain,
 					name,
@@ -181,7 +200,8 @@ export default async function (job) {
 					buildCommand,
 					startCommand,
 					baseDirectory,
-					secrets
+					secrets,
+					phpModules
 				});
 			else {
 				saveBuildLog({ line: `Build pack ${buildPack} not found`, buildId, applicationId });
@@ -241,14 +261,53 @@ export default async function (job) {
 		}
 		try {
 			saveBuildLog({ line: 'Deployment started.', buildId, applicationId });
-			const { stderr } = await asyncExecShell(
-				`DOCKER_HOST=${host} docker run ${envFound && `--env-file=${workdir}/.env`} ${labels.join(
-					' '
-				)} --name ${imageId} --network ${
-					docker.network
-				} --restart always -d ${applicationId}:${tag}`
+			// for await (const volume of volumes) {
+			// 	const id = volume.split(':')[0];
+			// 	try {
+			// 		await asyncExecShell(`DOCKER_HOST=${host} docker volume inspect ${id}`);
+			// 	} catch (error) {
+			// 		await asyncExecShell(`DOCKER_HOST=${host} docker volume create ${id}`);
+			// 	}
+			// }
+			const composeVolumes = volumes.map((volume) => {
+				return {
+					[`${volume.split(':')[0]}`]: {
+						name: volume.split(':')[0]
+					}
+				};
+			});
+			const compose = {
+				version: '3.8',
+				services: {
+					[imageId]: {
+						image: `${applicationId}:${tag}`,
+						container_name: imageId,
+						volumes,
+						env_file: envFound ? [`${workdir}/.env`] : [],
+						networks: [docker.network],
+						labels: labels,
+						depends_on: [],
+						restart: 'always'
+					}
+				},
+				networks: {
+					[docker.network]: {
+						external: true
+					}
+				},
+				volumes: Object.assign({}, ...composeVolumes)
+			};
+			await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(compose));
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker compose --project-directory ${workdir} up -d`
 			);
-			if (stderr) console.log(stderr);
+
+			// const { stderr } = await asyncExecShell(
+			// 	`DOCKER_HOST=${host} docker run ${envFound && `--env-file=${workdir}/.env`} ${labels.join(
+			// 		' '
+			// 	)} --name ${imageId} --network ${docker.network} --restart always ${volumes.length > 0 ? volumes : ''
+			// 	} -d ${applicationId}:${tag}`
+			// );
 			saveBuildLog({ line: 'Deployment successful!', buildId, applicationId });
 		} catch (error) {
 			saveBuildLog({ line: error, buildId, applicationId });

src/lib/queues/index.ts

@@ -87,7 +87,7 @@ const cron = async () => {
 
 	await queue.proxy.add('proxy', {}, { repeat: { every: 10000 } });
 	await queue.ssl.add('ssl', {}, { repeat: { every: dev ? 10000 : 60000 } });
-	await queue.cleanup.add('cleanup', {}, { repeat: { every: dev ? 10000 : 300000 } });
+	if (!dev) await queue.cleanup.add('cleanup', {}, { repeat: { every: 300000 } });
 	await queue.sslRenew.add('sslRenew', {}, { repeat: { every: 1800000 } });
 
 	const events = {
@@ -110,18 +110,18 @@ cron().catch((error) => {
 const buildQueueName = 'build_queue';
 const buildQueue = new Queue(buildQueueName, connectionOptions);
 const buildWorker = new Worker(buildQueueName, async (job) => await builder(job), {
-	concurrency: 2,
+	concurrency: 1,
 	...connectionOptions
 });
 
 buildWorker.on('completed', async (job: Bullmq.Job) => {
 	try {
 		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'success' } });
-	} catch (err) {
-		console.log(err);
+	} catch (error) {
+		console.log(error);
 	} finally {
 		const workdir = `/tmp/build-sources/${job.data.repository}/${job.data.build_id}`;
-		await asyncExecShell(`rm -fr ${workdir}`);
+		if (!dev) await asyncExecShell(`rm -fr ${workdir}`);
 	}
 	return;
 });
@@ -133,7 +133,7 @@ buildWorker.on('failed', async (job: Bullmq.Job, failedReason) => {
 		console.log(error);
 	} finally {
 		const workdir = `/tmp/build-sources/${job.data.repository}`;
-		await asyncExecShell(`rm -fr ${workdir}`);
+		if (!dev) await asyncExecShell(`rm -fr ${workdir}`);
 	}
 	saveBuildLog({
 		line: 'Failed to deploy!',

src/lib/queues/ssl.ts

@@ -4,6 +4,7 @@ export default async function () {
 	try {
 		return await generateSSLCerts();
 	} catch (error) {
+		console.log(error);
 		throw error;
 	}
 }

src/routes/applications/[id]/__layout.svelte

@@ -76,6 +76,7 @@
 	import { del, post } from '$lib/api';
 	import { goto } from '$app/navigation';
 	import { gitTokens } from '$lib/store';
+	import { toast } from '@zerodevx/svelte-toast';
 
 	if (githubToken) $gitTokens.githubToken = githubToken;
 	if (gitlabToken) $gitTokens.gitlabToken = gitlabToken;
@@ -86,6 +87,7 @@
 	async function handleDeploySubmit() {
 		try {
 			const { buildId } = await post(`/applications/${id}/deploy.json`, { ...application });
+			toast.push('Deployment queued.');
 			return await goto(`/applications/${id}/logs/build?buildId=${buildId}`);
 		} catch ({ error }) {
 			return errorNotification(error);
@@ -269,6 +271,35 @@
 					</svg></button
 				></a
 			>
+			<a
+				href="/applications/{id}/storage"
+				sveltekit:prefetch
+				class="hover:text-pink-500 rounded"
+				class:text-pink-500={$page.url.pathname === `/applications/${id}/storage`}
+				class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/storage`}
+			>
+				<button
+					title="Persistent Storage"
+					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
+					data-tooltip="Persistent Storage"
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="w-6 h-6"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<ellipse cx="12" cy="6" rx="8" ry="3" />
+						<path d="M4 6v6a8 3 0 0 0 16 0v-6" />
+						<path d="M4 12v6a8 3 0 0 0 16 0v-6" />
+					</svg>
+				</button></a
+			>
 			<a
 				href="/applications/{id}/previews"
 				sveltekit:prefetch

src/routes/applications/[id]/deploy.json.ts

@@ -11,6 +11,7 @@ export const post: RequestHandler = async (event) => {
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
+	const { pullmergeRequestId = null, branch } = await event.request.json();
 	try {
 		const buildId = cuid();
 		const applicationFound = await db.getApplication({ id, teamId });
@@ -30,7 +31,29 @@ export const post: RequestHandler = async (event) => {
 			await db.prisma.application.update({ where: { id }, data: { configHash } });
 		}
 		await db.prisma.application.update({ where: { id }, data: { updatedAt: new Date() } });
-		await buildQueue.add(buildId, { build_id: buildId, type: 'manual', ...applicationFound });
+		await db.prisma.build.create({
+			data: {
+				id: buildId,
+				applicationId: id,
+				destinationDockerId: applicationFound.destinationDocker.id,
+				gitSourceId: applicationFound.gitSource.id,
+				githubAppId: applicationFound.gitSource.githubApp?.id,
+				gitlabAppId: applicationFound.gitSource.gitlabApp?.id,
+				status: 'queued',
+				type: 'manual'
+			}
+		});
+		if (pullmergeRequestId) {
+			await buildQueue.add(buildId, {
+				build_id: buildId,
+				type: 'manual',
+				...applicationFound,
+				sourceBranch: branch,
+				pullmergeRequestId
+			});
+		} else {
+			await buildQueue.add(buildId, { build_id: buildId, type: 'manual', ...applicationFound });
+		}
 		return {
 			status: 200,
 			body: {

src/routes/applications/[id]/index.svelte

@@ -57,7 +57,6 @@
 	let previews = application.settings.previews;
 	let dualCerts = application.settings.dualCerts;
 	let autodeploy = application.settings.autodeploy;
-
 	if (browser && window.location.hostname === 'demo.coolify.io' && !application.fqdn) {
 		application.fqdn = `http://${cuid()}.demo.coolify.io`;
 	}
@@ -363,7 +362,6 @@
 					/>
 				</div>
 			{/if}
-
 			<div class="grid grid-cols-2 items-center">
 				<div class="flex-col">
 					<label for="baseDirectory" class="pt-2 text-base font-bold text-stone-100"

src/routes/applications/[id]/logs/build/_BuildLog.svelte

@@ -43,11 +43,11 @@
 			logs = logs.concat(responseLogs.map((log) => ({ ...log, line: cleanAnsiCodes(log.line) })));
 			loading = false;
 			streamInterval = setInterval(async () => {
-				if (status !== 'running') {
+				if (status !== 'running' && status !== 'queued') {
 					clearInterval(streamInterval);
 					return;
 				}
-				const nextSequence = logs[logs.length - 1].time;
+				const nextSequence = logs[logs.length - 1]?.time || 0;
 				try {
 					const data = await get(
 						`/applications/${id}/logs/build/build.json?buildId=${buildId}&sequence=${nextSequence}`
@@ -83,38 +83,42 @@
 		{#if currentStatus === 'running'}
 			<LoadingLogs />
 		{/if}
-		<div class="flex justify-end sticky top-0 p-2">
-			<button
-				on:click={followBuild}
-				class="bg-transparent"
-				data-tooltip="Follow logs"
-				class:text-green-500={followingBuild}
-			>
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					class="w-6 h-6"
-					viewBox="0 0 24 24"
-					stroke-width="1.5"
-					stroke="currentColor"
-					fill="none"
-					stroke-linecap="round"
-					stroke-linejoin="round"
+		{#if currentStatus === 'queued'}
+			<div class="text-center">Queued and waiting for execution.</div>
+		{:else}
+			<div class="flex justify-end sticky top-0 p-2">
+				<button
+					on:click={followBuild}
+					class="bg-transparent"
+					data-tooltip="Follow logs"
+					class:text-green-500={followingBuild}
 				>
-					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-					<circle cx="12" cy="12" r="9" />
-					<line x1="8" y1="12" x2="12" y2="16" />
-					<line x1="12" y1="8" x2="12" y2="16" />
-					<line x1="16" y1="12" x2="12" y2="16" />
-				</svg>
-			</button>
-		</div>
-		<div
-			class="font-mono leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
-			bind:this={logsEl}
-		>
-			{#each logs as log}
-				<div>{log.line + '\n'}</div>
-			{/each}
-		</div>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="w-6 h-6"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<circle cx="12" cy="12" r="9" />
+						<line x1="8" y1="12" x2="12" y2="16" />
+						<line x1="12" y1="8" x2="12" y2="16" />
+						<line x1="16" y1="12" x2="12" y2="16" />
+					</svg>
+				</button>
+			</div>
+			<div
+				class="font-mono leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
+				bind:this={logsEl}
+			>
+				{#each logs as log}
+					<div>{log.line + '\n'}</div>
+				{/each}
+			</div>
+		{/if}
 	</div>
 {/if}

src/routes/applications/[id]/logs/build/build.json.ts

@@ -19,7 +19,7 @@ export const get: RequestHandler = async (event) => {
 		return {
 			body: {
 				logs,
-				status: data?.status || 'running'
+				status: data?.status
 			}
 		};
 	} catch (error) {

src/routes/applications/[id]/logs/build/index.svelte

@@ -121,6 +121,8 @@
 					<div class="w-48 text-center text-xs">
 						{#if build.status === 'running'}
 							<div class="font-bold">Running</div>
+						{:else if build.status === 'queued'}
+							<div class="font-bold">Queued</div>
 						{:else}
 							<div>{build.since}</div>
 							<div>Finished in <span class="font-bold">{build.took}s</span></div>

src/routes/applications/[id]/previews/index.svelte

@@ -26,15 +26,28 @@
 	export let applicationSecrets;
 	import { getDomain } from '$lib/components/common';
 	import Secret from '../secrets/_Secret.svelte';
-	import { get } from '$lib/api';
+	import { get, post } from '$lib/api';
 	import { page } from '$app/stores';
 	import Explainer from '$lib/components/Explainer.svelte';
+	import { errorNotification } from '$lib/form';
+	import { toast } from '@zerodevx/svelte-toast';
 
 	const { id } = $page.params;
 	async function refreshSecrets() {
 		const data = await get(`/applications/${id}/secrets.json`);
 		PRMRSecrets = [...data.secrets];
 	}
+	async function redeploy(container) {
+		try {
+			await post(`/applications/${id}/deploy.json`, {
+				pullmergeRequestId: container.pullmergeRequestId,
+				branch: container.branch
+			});
+			toast.push('Application redeployed queued.');
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -90,6 +103,11 @@
 						<div class="truncate text-center text-xl font-bold">{getDomain(container.fqdn)}</div>
 					</div>
 				</a>
+				<div class="flex items-center justify-center">
+					<button class="bg-coollabs hover:bg-coollabs-100" on:click={() => redeploy(container)}
+						>Redeploy</button
+					>
+				</div>
 			{/each}
 		{:else}
 			<div class="flex-col">

src/routes/applications/[id]/storage/_Storage.svelte

@@ -0,0 +1,73 @@
+<script lang="ts">
+	export let isNew = false;
+	export let storage = {
+		id: null,
+		path: null
+	};
+	import { del, post } from '$lib/api';
+	import { page } from '$app/stores';
+	import { createEventDispatcher } from 'svelte';
+
+	import { errorNotification } from '$lib/form';
+	import { toast } from '@zerodevx/svelte-toast';
+	const { id } = $page.params;
+
+	const dispatch = createEventDispatcher();
+	async function saveStorage(newStorage = false) {
+		try {
+			if (!storage.path) return errorNotification('Path is required.');
+			storage.path = storage.path.startsWith('/') ? storage.path : `/${storage.path}`;
+			storage.path = storage.path.endsWith('/') ? storage.path.slice(0, -1) : storage.path;
+			storage.path.replace(/\/\//g, '/');
+			await post(`/applications/${id}/storage.json`, {
+				path: storage.path,
+				storageId: storage.id,
+				newStorage
+			});
+			dispatch('refresh');
+			if (isNew) {
+				storage.path = null;
+				storage.id = null;
+			}
+			if (newStorage) toast.push('Storage saved.');
+			else toast.push('Storage updated.');
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
+	async function removeStorage() {
+		try {
+			await del(`/applications/${id}/storage.json`, { path: storage.path });
+			dispatch('refresh');
+			toast.push('Storage deleted.');
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
+</script>
+
+<td>
+	<input
+		bind:value={storage.path}
+		required
+		placeholder="eg: /sqlite.db"
+		class=" border border-dashed border-coolgray-300"
+	/>
+</td>
+<td>
+	{#if isNew}
+		<div class="flex items-center justify-center">
+			<button class="bg-green-600 hover:bg-green-500" on:click={() => saveStorage(true)}>Add</button
+			>
+		</div>
+	{:else}
+		<div class="flex flex-row justify-center space-x-2">
+			<div class="flex items-center justify-center">
+				<button class="" on:click={() => saveStorage(false)}>Set</button>
+			</div>
+			<div class="flex justify-center items-end">
+				<button class="bg-red-600 hover:bg-red-500" on:click={removeStorage}>Remove</button>
+			</div>
+		</div>
+	{/if}
+</td>

src/routes/applications/[id]/storage/index.json.ts

@@ -0,0 +1,63 @@
+import { getUserDetails } from '$lib/common';
+import * as db from '$lib/database';
+import { ErrorHandler } from '$lib/database';
+import type { RequestHandler } from '@sveltejs/kit';
+
+export const get: RequestHandler = async (event) => {
+	const { status, body, teamId } = await getUserDetails(event, false);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+	try {
+		const persistentStorages = await db.getPersistentStorage(id);
+		return {
+			body: {
+				persistentStorages
+			}
+		};
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
+
+export const post: RequestHandler = async (event) => {
+	const { teamId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+	const { path, newStorage, storageId } = await event.request.json();
+	try {
+		if (newStorage) {
+			await db.prisma.applicationPersistentStorage.create({
+				data: { path, application: { connect: { id } } }
+			});
+		} else {
+			await db.prisma.applicationPersistentStorage.update({
+				where: { id: storageId },
+				data: { path }
+			});
+		}
+		return {
+			status: 201
+		};
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
+
+export const del: RequestHandler = async (event) => {
+	const { teamId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+	const { path } = await event.request.json();
+
+	try {
+		await db.prisma.applicationPersistentStorage.deleteMany({ where: { applicationId: id, path } });
+		return {
+			status: 200
+		};
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};

src/routes/applications/[id]/storage/index.svelte

@@ -0,0 +1,73 @@
+<script context="module" lang="ts">
+	import type { Load } from '@sveltejs/kit';
+	export const load: Load = async ({ fetch, params, stuff }) => {
+		let endpoint = `/applications/${params.id}/storage.json`;
+		const res = await fetch(endpoint);
+		if (res.ok) {
+			return {
+				props: {
+					application: stuff.application,
+					...(await res.json())
+				}
+			};
+		}
+
+		return {
+			status: res.status,
+			error: new Error(`Could not load ${endpoint}`)
+		};
+	};
+</script>
+
+<script lang="ts">
+	export let application;
+
+	export let persistentStorages;
+	import { getDomain } from '$lib/components/common';
+	import { page } from '$app/stores';
+	import Storage from './_Storage.svelte';
+	import { get } from '$lib/api';
+	import Explainer from '$lib/components/Explainer.svelte';
+
+	const { id } = $page.params;
+	async function refreshStorage() {
+		const data = await get(`/applications/${id}/storage.json`);
+		persistentStorages = [...data.persistentStorages];
+	}
+</script>
+
+<div class="flex space-x-1 p-6 font-bold">
+	<div class="mr-4 text-2xl tracking-tight">
+		Persistent storage for <a href={application.fqdn} target="_blank"
+			>{getDomain(application.fqdn)}</a
+		>
+	</div>
+</div>
+
+<div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
+	<div class="flex justify-center py-4 text-center">
+		<Explainer
+			customClass="w-full"
+			text={'You can specify any folder that you want to be persistent across deployments. <br>This is useful for storing data such as a database (SQLite) or a cache.'}
+		/>
+	</div>
+	<table class="mx-auto border-separate text-left">
+		<thead>
+			<tr class="h-12">
+				<th scope="col">Path</th>
+			</tr>
+		</thead>
+		<tbody>
+			{#each persistentStorages as storage}
+				{#key storage.id}
+					<tr>
+						<Storage on:refresh={refreshStorage} {storage} />
+					</tr>
+				{/key}
+			{/each}
+			<tr>
+				<Storage on:refresh={refreshStorage} isNew />
+			</tr>
+		</tbody>
+	</table>
+</div>

src/routes/webhooks/github/events.ts

@@ -47,7 +47,7 @@ export const post: RequestHandler = async (event) => {
 
 		const applicationFound = await db.getApplicationWebhook({ projectId, branch });
 		if (applicationFound) {
-			const webhookSecret = applicationFound.gitSource.githubApp.webhookSecret;
+			const webhookSecret = applicationFound.gitSource.githubApp.webhookSecret || null;
 			const hmac = crypto.createHmac('sha256', webhookSecret);
 			const digest = Buffer.from(
 				'sha256=' + hmac.update(JSON.stringify(body)).digest('hex'),
@@ -88,6 +88,18 @@ export const post: RequestHandler = async (event) => {
 					where: { id: applicationFound.id },
 					data: { updatedAt: new Date() }
 				});
+				await db.prisma.build.create({
+					data: {
+						id: buildId,
+						applicationId: applicationFound.id,
+						destinationDockerId: applicationFound.destinationDocker.id,
+						gitSourceId: applicationFound.gitSource.id,
+						githubAppId: applicationFound.gitSource.githubApp?.id,
+						gitlabAppId: applicationFound.gitSource.gitlabApp?.id,
+						status: 'queued',
+						type: 'webhook_commit'
+					}
+				});
 				await buildQueue.add(buildId, {
 					build_id: buildId,
 					type: 'webhook_commit',
@@ -136,6 +148,18 @@ export const post: RequestHandler = async (event) => {
 							where: { id: applicationFound.id },
 							data: { updatedAt: new Date() }
 						});
+						await db.prisma.build.create({
+							data: {
+								id: buildId,
+								applicationId: applicationFound.id,
+								destinationDockerId: applicationFound.destinationDocker.id,
+								gitSourceId: applicationFound.gitSource.id,
+								githubAppId: applicationFound.gitSource.githubApp?.id,
+								gitlabAppId: applicationFound.gitSource.gitlabApp?.id,
+								status: 'queued',
+								type: 'webhook_pr'
+							}
+						});
 						await buildQueue.add(buildId, {
 							build_id: buildId,
 							type: 'webhook_pr',

src/routes/webhooks/gitlab/events.ts

@@ -52,6 +52,18 @@ export const post: RequestHandler = async (event) => {
 					where: { id: applicationFound.id },
 					data: { updatedAt: new Date() }
 				});
+				await db.prisma.build.create({
+					data: {
+						id: buildId,
+						applicationId: applicationFound.id,
+						destinationDockerId: applicationFound.destinationDocker.id,
+						gitSourceId: applicationFound.gitSource.id,
+						githubAppId: applicationFound.gitSource.githubApp?.id,
+						gitlabAppId: applicationFound.gitSource.gitlabApp?.id,
+						status: 'queued',
+						type: 'webhook_commit'
+					}
+				});
 				await buildQueue.add(buildId, {
 					build_id: buildId,
 					type: 'webhook_commit',
@@ -133,6 +145,18 @@ export const post: RequestHandler = async (event) => {
 							where: { id: applicationFound.id },
 							data: { updatedAt: new Date() }
 						});
+						await db.prisma.build.create({
+							data: {
+								id: buildId,
+								applicationId: applicationFound.id,
+								destinationDockerId: applicationFound.destinationDocker.id,
+								gitSourceId: applicationFound.gitSource.id,
+								githubAppId: applicationFound.gitSource.githubApp?.id,
+								gitlabAppId: applicationFound.gitSource.gitlabApp?.id,
+								status: 'queued',
+								type: 'webhook_mr'
+							}
+						});
 						await buildQueue.add(buildId, {
 							build_id: buildId,
 							type: 'webhook_mr',

src/tailwind.css

@@ -42,7 +42,27 @@ textarea {
 }
 
 select {
-	@apply h-12 w-96 rounded bg-coolgray-200 p-2 text-xs font-bold tracking-tight text-white outline-none transition duration-150 hover:bg-coolgray-500 focus:bg-coolgray-500 disabled:text-stone-600 md:text-sm;
+	@apply h-12 w-96 rounded bg-coolgray-200  p-2 text-xs font-bold tracking-tight text-white placeholder-stone-600 outline-none transition duration-150 hover:bg-coolgray-500 focus:bg-coolgray-500 disabled:text-stone-600 md:text-sm;
+}
+.svelte-select {
+	--background: rgb(32 32 32);
+	--inputColor: white;
+	--multiItemPadding: 0;
+	--multiSelectPadding: 0 0.5rem 0 0.5rem;
+	--border: none;
+	--placeholderColor: rgb(87 83 78);
+	--listBackground: rgb(32 32 32);
+	--itemColor: white;
+	--itemHoverBG: rgb(107 22 237);
+	--multiItemBG: rgb(32 32 32);
+	--multiClearHoverBG: transparent;
+	--multiClearHoverFill: rgb(239 68 68);
+	--multiItemActiveBG: transparent;
+	--multiClearBG: transparent;
+	--clearSelectFocusColor: white;
+	--clearSelectHoverColor: rgb(239 68 68);
+	--multiItemBorderRadius: 0.25rem;
+	--listShadow: none;
 }
 
 label {