fix: debug api logging + gh actions

.github/workflows/release-candidate.yml

@@ -85,6 +85,6 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Create & publish manifest
         run: |
-          docker manifest create coollabsio/coolify:v3.9.1-rc.1 --amend coollabsio/coolify:v3.9.1-rc.1-amd64 --amend coollabsio/coolify:v3.9.1-rc.1-arm64
+          docker manifest create coollabsio/coolify:${{github.event.release.name}} --amend coollabsio/coolify:${{github.event.release.name}}-amd64 --amend coollabsio/coolify:${{github.event.release.name}}-arm64
-          docker manifest push coollabsio/coolify:v3.9.1-rc.1
+          docker manifest push coollabsio/coolify:${{github.event.release.name}}
           

.github/workflows/staging-release.yml

@@ -6,11 +6,13 @@ on:
       - next
 
 jobs:
-  staging-release:
+  arm64-making-something-cool:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, arm64]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+        with:
+          ref: "next"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -20,15 +22,65 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Get current package version
+        uses: martinbeentjes/npm-get-version-action@v1.2.3
+        id: package-version
       - name: Build and push
         uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/arm64
+          push: true
+          tags: coollabsio/coolify:next-arm64
+          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-arm64
+          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-arm64,mode=max
+  amd64-making-something-cool:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: "next"
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Get current package version
+        uses: martinbeentjes/npm-get-version-action@v1.2.3
+        id: package-version
+      - name: Build and push
+        uses: docker/build-push-action@v3
         with:
           context: .
           platforms: linux/amd64
           push: true
-          tags: coollabsio/coolify:next
+          tags: coollabsio/coolify:next-amd64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next
+          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-amd64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next,mode=max
+          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-amd64,mode=max
+  merge-manifest-to-be-cool:
+    runs-on: ubuntu-latest
+    needs: [arm64-making-something-cool, amd64-making-something-cool]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Create & publish manifest
+        run: |
+          docker manifest create coollabsio/coolify:next --amend coollabsio/coolify:next-amd64 --amend coollabsio/coolify:next-arm64
+          docker manifest push coollabsio/coolify:next
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

apps/api/prisma/migrations/20220906120112_enable_api_debug_logging/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Setting" ADD COLUMN "isAPIDebuggingEnabled" BOOLEAN DEFAULT false;

apps/api/prisma/schema.prisma

@@ -11,6 +11,7 @@ datasource db {
 model Setting {
   id                    String   @id @default(cuid())
   fqdn                  String?  @unique
+  isAPIDebuggingEnabled Boolean? @default(false)
   isRegistrationEnabled Boolean  @default(false)
   dualCerts             Boolean  @default(false)
   minPort               Int      @default(9000)

apps/api/src/index.ts

@@ -26,11 +26,12 @@ declare module 'fastify' {
 
 const port = isDev ? 3001 : 3000;
 const host = '0.0.0.0';
-const fastify = Fastify({
+prisma.setting.findFirst().then(async (settings) => {
-	logger: false,
+	const fastify = Fastify({
+		logger: settings?.isAPIDebuggingEnabled || false,
 		trustProxy: true
-});
+	});
-const schema = {
+	const schema = {
 		type: 'object',
 		required: ['COOLIFY_SECRET_KEY', 'COOLIFY_DATABASE_URL', 'COOLIFY_IS_ON'],
 		properties: {
@@ -66,14 +67,14 @@ const schema = {
 			},
 
 		}
-};
+	};
 
-const options = {
+	const options = {
 		schema,
 		dotenv: true
-};
+	};
-fastify.register(env, options);
+	fastify.register(env, options);
-if (!isDev) {
+	if (!isDev) {
 		fastify.register(serve, {
 			root: path.join(__dirname, './public'),
 			preCompressed: true
@@ -86,24 +87,24 @@ if (!isDev) {
 			}
 			return reply.status(200).sendFile('index.html');
 		});
-}
+	}
-fastify.register(autoLoad, {
+	fastify.register(autoLoad, {
 		dir: join(__dirname, 'plugins')
-});
+	});
-fastify.register(autoLoad, {
+	fastify.register(autoLoad, {
 		dir: join(__dirname, 'routes')
-});
+	});
 
-fastify.register(cookie)
+	fastify.register(cookie)
-fastify.register(cors);
+	fastify.register(cors);
-fastify.addHook('onRequest', async (request, reply) => {
+	fastify.addHook('onRequest', async (request, reply) => {
 		let allowedList = ['coolify:3000'];
 		const { ipv4, ipv6, fqdn } = await prisma.setting.findFirst({})
 
 		ipv4 && allowedList.push(`${ipv4}:3000`);
 		ipv6 && allowedList.push(ipv6);
 		fqdn && allowedList.push(getDomain(fqdn));
-
+		isDev && allowedList.push('localhost:3000') && allowedList.push('localhost:3001') && allowedList.push('host.docker.internal:3001');
 		const remotes = await prisma.destinationDocker.findMany({ where: { remoteEngine: true, remoteVerified: true } })
 		if (remotes.length > 0) {
 			remotes.forEach(remote => {
@@ -111,10 +112,10 @@ fastify.addHook('onRequest', async (request, reply) => {
 			})
 		}
 		if (!allowedList.includes(request.headers.host)) {
-		console.log('not allowed', request.headers.host)
+			// console.log('not allowed', request.headers.host)
 		}
-})
+	})
-fastify.listen({ port, host }, async (err: any, address: any) => {
+	fastify.listen({ port, host }, async (err: any, address: any) => {
 		if (err) {
 			console.error(err);
 			process.exit(1);
@@ -157,9 +158,11 @@ fastify.listen({ port, host }, async (err: any, address: any) => {
 		await Promise.all([
 			getArch(),
 			getIPAddress(),
-		// configureRemoteDockers(),
+			configureRemoteDockers(),
 		])
-});
+	});
+})
+
 async function getIPAddress() {
 	const { publicIpv4, publicIpv6 } = await import('public-ip')
 	try {

apps/api/src/jobs/deployApplication.ts

@@ -357,21 +357,15 @@ import * as buildpacks from '../lib/buildPacks';
 								await saveBuildLog({ line: error, buildId, applicationId: application.id });
 							}
 						});
-
 					}
-
 					await pAll.default(actions, { concurrency })
 				}
 			} catch (error) {
 				console.log(error)
-			} finally {
 			}
 		})
-
 		while (true) {
 			await th()
 		}
-
-
 	} else process.exit(0);
 })();

apps/api/src/lib/common.ts

@@ -21,7 +21,7 @@ import { scheduler } from './scheduler';
 import { supportedServiceTypesAndVersions } from './services/supportedVersions';
 import { includeServices } from './services/common';
 
-export const version = '3.9.1-rc.1';
+export const version = '3.9.1';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';

apps/api/src/routes/api/v1/settings/handlers.ts

@@ -28,6 +28,7 @@ export async function saveSettings(request: FastifyRequest<SaveSettings>, reply:
     try {
         const {
             fqdn,
+            isAPIDebuggingEnabled,
             isRegistrationEnabled,
             dualCerts,
             minPort,
@@ -39,7 +40,7 @@ export async function saveSettings(request: FastifyRequest<SaveSettings>, reply:
         const { id } = await listSettings();
         await prisma.setting.update({
             where: { id },
-            data: { isRegistrationEnabled, dualCerts, isAutoUpdateEnabled, isDNSCheckEnabled, DNSServers }
+            data: { isRegistrationEnabled, dualCerts, isAutoUpdateEnabled, isDNSCheckEnabled, DNSServers, isAPIDebuggingEnabled }
         });
         if (fqdn) {
             await prisma.setting.update({ where: { id }, data: { fqdn } });

apps/api/src/routes/api/v1/settings/types.ts

@@ -3,6 +3,7 @@ import { OnlyId } from "../../../../types"
 export interface SaveSettings {
     Body: {
         fqdn: string,
+        isAPIDebuggingEnabled: boolean,
         isRegistrationEnabled: boolean,
         dualCerts: boolean,
         minPort: number,

apps/ui/src/routes/settings/global.svelte

@@ -27,6 +27,7 @@
 	import Menu from './_Menu.svelte';
 	import Explainer from '$lib/components/Explainer.svelte';
 
+	let isAPIDebuggingEnabled = settings.isAPIDebuggingEnabled;
 	let isRegistrationEnabled = settings.isRegistrationEnabled;
 	let dualCerts = settings.dualCerts;
 	let isAutoUpdateEnabled = settings.isAutoUpdateEnabled;
@@ -75,8 +76,11 @@
 			if (name === 'isDNSCheckEnabled') {
 				isDNSCheckEnabled = !isDNSCheckEnabled;
 			}
-
+			if (name === 'isAPIDebuggingEnabled') {
+				isAPIDebuggingEnabled = !isAPIDebuggingEnabled;
+			}
 			await post(`/settings`, {
+				isAPIDebuggingEnabled,
 				isRegistrationEnabled,
 				dualCerts,
 				isAutoUpdateEnabled,
@@ -310,6 +314,15 @@
 							on:click={() => changeSettings('isRegistrationEnabled')}
 						/>
 					</div>
+					<div class="grid grid-cols-2 items-center">
+						<Setting
+							id="isAPIDebuggingEnabled"
+							bind:setting={isAPIDebuggingEnabled}
+							title="API Debugging"
+							description="Enable API debugging. This will log all API requests and responses.<br><br>You need to restart the Coolify (button on dashboard) for this to take effect."
+							on:click={() => changeSettings('isAPIDebuggingEnabled')}
+						/>
+					</div>
 					{#if browser && $features.beta}
 						<div class="grid grid-cols-2 items-center">
 							<Setting

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.9.1-rc.1",
+  "version": "3.9.1",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {