From 2e56a113d950436e71b6b83d08f1f699ee8268bc Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 20 Jan 2023 13:48:57 +0100 Subject: [PATCH 1/5] Test GH release thing --- .github/workflows/staging-release.yml | 55 ++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/.github/workflows/staging-release.yml b/.github/workflows/staging-release.yml index 2f24fff03..e52db63da 100644 --- a/.github/workflows/staging-release.yml +++ b/.github/workflows/staging-release.yml @@ -12,8 +12,8 @@ on: - next jobs: - build: - runs-on: ubuntu-latest + arm64: + runs-on: [self-hosted, arm64] steps: - name: Checkout uses: actions/checkout@v3 @@ -28,13 +28,64 @@ 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: + 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 + cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-amd64 + cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-amd64,mode=max + merge-manifest: + runs-on: ubuntu-latest + needs: [arm64, amd64] + 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 buildx imagetools create --append coollabsio/coolify:next-arm64 --tag coollabsio/coolify:next - uses: sarisia/actions-status-discord@v1 if: always() with: From 9e52b2788dc6c77d825f9f48d4f2b31844ca71cc Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 20 Jan 2023 13:49:39 +0100 Subject: [PATCH 2/5] Pocketbase GH release updated --- .github/workflows/pocketbase-release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pocketbase-release.yml b/.github/workflows/pocketbase-release.yml index 3f9762907..e8abfb5c5 100644 --- a/.github/workflows/pocketbase-release.yml +++ b/.github/workflows/pocketbase-release.yml @@ -5,7 +5,9 @@ on: paths: - "others/pocketbase/*" - ".github/workflows/pocketbase-release.yml" - + branches: + - next + - main jobs: arm64: runs-on: [self-hosted, arm64] From f82cfda07ff90cb0593539f4e78845d9ec40ea75 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 20 Jan 2023 13:55:05 +0100 Subject: [PATCH 3/5] version++ --- apps/api/src/lib/common.ts | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index 3eeced3f7..1bfc1ac8c 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.15'; +export const version = '3.12.16'; export const isDev = process.env.NODE_ENV === 'development'; export const sentryDSN = 'https://409f09bcb7af47928d3e0f46b78987f3@o1082494.ingest.sentry.io/4504236622217216'; diff --git a/package.json b/package.json index 88034d7b7..fb7066cb9 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.15", + "version": "3.12.16", "license": "Apache-2.0", "repository": "github:coollabsio/coolify", "scripts": { From 578bb12562a27f34c09b6027490e33ddd2ace23a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 20 Jan 2023 14:05:07 +0100 Subject: [PATCH 4/5] test new release gh action --- .github/workflows/production-release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/production-release.yml b/.github/workflows/production-release.yml index 7b98d5cf9..dc73248cf 100644 --- a/.github/workflows/production-release.yml +++ b/.github/workflows/production-release.yml @@ -54,7 +54,7 @@ jobs: context: . platforms: linux/amd64 push: true - tags: coollabsio/coolify:${{steps.package-version.outputs.current-version}}-amd64 + tags: coollabsio/coolify:${{steps.package-version.outputs.current-version}} cache-from: type=registry,ref=coollabsio/coolify:buildcache-amd64 cache-to: type=registry,ref=coollabsio/coolify:buildcache-amd64,mode=max aarch64: @@ -103,10 +103,10 @@ jobs: id: package-version - name: Create & publish manifest run: | - docker manifest create coollabsio/coolify:${{steps.package-version.outputs.current-version}} --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-amd64 --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64 --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-aarch64 - docker manifest create coollabsio/coolify:latest --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-amd64 --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64 --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-aarch64 - docker manifest push coollabsio/coolify:${{steps.package-version.outputs.current-version}} - docker manifest push coollabsio/coolify:latest + docker buildx imagetools create --append coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64 --append coollabsio/coolify:${{steps.package-version.outputs.current-version}}-aarch64 --tag coollabsio/coolify:${{steps.package-version.outputs.current-version}} + docker tag coollabsio/coolify:${{steps.package-version.outputs.current-version}} coollabsio/coolify:latest + docker push coollabsio/coolify:latest + docker buildx imagetools create --append coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64 --append coollabsio/coolify:${{steps.package-version.outputs.current-version}}-aarch64 --tag coollabsio/coolify:latest - uses: sarisia/actions-status-discord@v1 if: always() with: From 15c9ad23fe1e8df7e97128730b489bf983f1016b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 20 Jan 2023 14:06:55 +0100 Subject: [PATCH 5/5] fix: stucked containers --- apps/api/src/index.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index b3214ecee..456faa513 100644 --- a/apps/api/src/index.ts +++ b/apps/api/src/index.ts @@ -172,9 +172,9 @@ const host = '0.0.0.0'; }, 60000 * 15); // Cleanup stucked containers (not defined in Coolify, but still running and managed by Coolify) - setInterval(async () => { - await cleanupStuckedContainers(); - }, 60000 * 5); + // setInterval(async () => { + // await cleanupStuckedContainers(); + // }, 60000 * 5); // checkProxies, checkFluentBit & refresh templates setInterval(async () => { @@ -206,8 +206,8 @@ const host = '0.0.0.0'; getTagsTemplates(), getArch(), getIPAddress(), - configureRemoteDockers(), - cleanupStuckedContainers() + configureRemoteDockers() + // cleanupStuckedContainers() ]); } catch (error) { console.error(error);