Merge pull request #582 from coollabsio/next

v3.9.0

.github/workflows/release-candidate.yml

@@ -1,16 +1,17 @@
 name: release-candidate
+
 on:
   release:
     types: [prereleased]
 
 jobs:
-  arm64-making-something-cool:
-    runs-on: [self-hosted, arm64]
+  making-something-cool:
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          ref: "next"
+          ref: 'next'
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -27,64 +28,12 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/arm64
+          platforms: linux/amd64,linux/arm64
           push: true
-          tags: coollabsio/coolify:${{github.event.release.name}}-arm64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-rc-arm64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-rc-arm64,mode=max
+          tags: coollabsio/coolify:${{github.event.release.name}}
+          cache-from: type=registry,ref=coollabsio/coolify:buildcache-rc
+          cache-to: type=registry,ref=coollabsio/coolify:buildcache-rc,mode=max
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:
           webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL }}
-  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:${{github.event.release.name}}-amd64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-rc-amd64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-rc-amd64,mode=max
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL }}
-  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: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 push coollabsio/coolify:v3.9.1-rc.1
-          

Dockerfile

@@ -1,12 +1,8 @@
-ARG PNPM_VERSION=7.11.0
-ARG NPM_VERSION=8.19.1
-ARG TARGETPLATFORM
-
 FROM node:18-slim as build
 WORKDIR /app
 
 RUN apt update && apt -y install curl
-RUN npm --no-update-notifier --no-fund --global install pnpm@${PNPM_VERSION}
+RUN curl -sL https://unpkg.com/@pnpm/self-installer | node
 
 COPY . .
 RUN pnpm install
@@ -16,11 +12,10 @@ RUN pnpm build
 FROM node:18-slim
 WORKDIR /app
 ENV NODE_ENV production
+ARG TARGETPLATFORM
 
-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}/
-RUN npm --no-update-notifier --no-fund --global install pnpm@${PNPM_VERSION}
-RUN npm install -g npm@${PNPM_VERSION}
+RUN apt update && apt -y install git git-lfs openssh-client curl jq cmake sqlite3 openssl psmisc python3 && apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/{apt,dpkg,cache,log}/
+RUN curl -sL https://unpkg.com/@pnpm/self-installer | node
 
 RUN mkdir -p ~/.docker/cli-plugins/
 # https://download.docker.com/linux/static/stable/

apps/api/src/index.ts

@@ -5,7 +5,7 @@ import env from '@fastify/env';
 import cookie from '@fastify/cookie';
 import path, { join } from 'path';
 import autoLoad from '@fastify/autoload';
-import { asyncExecShell, createRemoteEngineConfiguration, getDomain, isDev, listSettings, prisma, version } from './lib/common';
+import { asyncExecShell, createRemoteEngineConfiguration, isDev, listSettings, prisma, version } from './lib/common';
 import { scheduler } from './lib/scheduler';
 import { compareVersions } from 'compare-versions';
 import Graceful from '@ladjs/graceful'
@@ -96,24 +96,6 @@ fastify.register(autoLoad, {
 
 fastify.register(cookie)
 fastify.register(cors);
-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));
-
-	const remotes = await prisma.destinationDocker.findMany({ where: { remoteEngine: true, remoteVerified: true } })
-	if (remotes.length > 0) {
-		remotes.forEach(remote => {
-			allowedList.push(`${remote.remoteIpAddress}:3000`);
-		})
-	}
-	if (!allowedList.includes(request.headers.host)) {
-		console.log('not allowed', request.headers.host)
-	}
-})
 fastify.listen({ port, host }, async (err: any, address: any) => {
 	if (err) {
 		console.error(err);

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.0';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
@@ -974,13 +974,9 @@ export const createDirectories = async ({
 }): Promise<{ workdir: string; repodir: string }> => {
 	const repodir = `/tmp/build-sources/${repository}/`;
 	const workdir = `/tmp/build-sources/${repository}/${buildId}`;
-	try {
-		await fs.stat(workdir);
-		await asyncExecShell(`rm -fr ${workdir}`);
-		await asyncExecShell(`mkdir -p ${workdir}`);
-	} catch(error) {
-		await asyncExecShell(`mkdir -p ${workdir}`);
-	}
+
+	await asyncExecShell(`mkdir -p ${workdir}`);
+
 	return {
 		workdir,
 		repodir

apps/api/src/routes/webhooks/traefik/index.ts

@@ -1,5 +1,4 @@
 import { FastifyPluginAsync } from 'fastify';
-import { OnlyId } from '../../../types';
 import { remoteTraefikConfiguration, traefikConfiguration, traefikOtherConfiguration } from './handlers';
 import { TraefikOtherConfiguration } from './types';
 
@@ -7,7 +6,7 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
     fastify.get('/main.json', async (request, reply) => traefikConfiguration(request, reply));
     fastify.get<TraefikOtherConfiguration>('/other.json', async (request, reply) => traefikOtherConfiguration(request));
 
-    fastify.get<OnlyId>('/remote/:id', async (request) => remoteTraefikConfiguration(request));
+    fastify.get('/remote/:id', async (request) => remoteTraefikConfiguration(request));
 };
 
 export default root;

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