Skip to content

Commit 6b25bc7

Browse files
andrasbacsaiandrasbacsai
authored
v4.0.0-beta.443 (#7144)
2 parents 7bbfa09 + 9656855 commit 6b25bc7

File tree

90 files changed

+3514
-507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+3514
-507
lines changed

‎.coderabbit.yaml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.github/workflows/coolify-helper-next.yml‎

Lines changed: 21 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,17 @@ env:
1717
IMAGE_NAME: "coollabsio/coolify-helper"
1818

1919
jobs:
20-
amd64:
21-
runs-on: ubuntu-latest
20+
build-push:
21+
strategy:
22+
matrix:
23+
include:
24+
- arch: amd64
25+
platform: linux/amd64
26+
runner: ubuntu-24.04
27+
- arch: aarch64
28+
platform: linux/aarch64
29+
runner: ubuntu-24.04-arm
30+
runs-on: ${{ matrix.runner }}
2231
steps:
2332
- uses: actions/checkout@v5
2433
with:
@@ -43,60 +52,22 @@ jobs:
4352
run: |
4453
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
4554
46-
- name: Build and Push Image
55+
- name: Build and Push Image (${{ matrix.arch }})
4756
uses: docker/build-push-action@v6
4857
with:
4958
context: .
5059
file: docker/coolify-helper/Dockerfile
51-
platforms: linux/amd64
60+
platforms: ${{ matrix.platform }}
5261
push: true
5362
tags: |
54-
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
55-
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
56-
labels: |
57-
coolify.managed=true
58-
aarch64:
59-
runs-on: [ self-hosted, arm64 ]
60-
steps:
61-
- uses: actions/checkout@v5
62-
with:
63-
persist-credentials: false
64-
65-
- name: Login to ${{ env.GITHUB_REGISTRY }}
66-
uses: docker/login-action@v3
67-
with:
68-
registry: ${{ env.GITHUB_REGISTRY }}
69-
username: ${{ github.actor }}
70-
password: ${{ secrets.GITHUB_TOKEN }}
71-
72-
- name: Login to ${{ env.DOCKER_REGISTRY }}
73-
uses: docker/login-action@v3
74-
with:
75-
registry: ${{ env.DOCKER_REGISTRY }}
76-
username: ${{ secrets.DOCKER_USERNAME }}
77-
password: ${{ secrets.DOCKER_TOKEN }}
78-
79-
- name: Get Version
80-
id: version
81-
run: |
82-
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
83-
84-
- name: Build and Push Image
85-
uses: docker/build-push-action@v6
86-
with:
87-
context: .
88-
file: docker/coolify-helper/Dockerfile
89-
platforms: linux/aarch64
90-
push: true
91-
tags: |
92-
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
93-
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
63+
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-${{ matrix.arch }}
64+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-${{ matrix.arch }}
9465
labels: |
9566
coolify.managed=true
9667
9768
merge-manifest:
98-
runs-on: ubuntu-latest
99-
needs: [ amd64, aarch64 ]
69+
runs-on: ubuntu-24.04
70+
needs: build-push
10071
steps:
10172
- uses: actions/checkout@v5
10273
with:
@@ -126,14 +97,16 @@ jobs:
12697
- name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
12798
run: |
12899
docker buildx imagetools create \
129-
--append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
100+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-amd64 \
101+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
130102
--tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next \
131103
--tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:next
132104
133105
- name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
134106
run: |
135107
docker buildx imagetools create \
136-
--append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
108+
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-amd64 \
109+
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
137110
--tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next \
138111
--tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:next
139112

‎.github/workflows/coolify-helper.yml‎

Lines changed: 21 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,17 @@ env:
1717
IMAGE_NAME: "coollabsio/coolify-helper"
1818

1919
jobs:
20-
amd64:
21-
runs-on: ubuntu-latest
20+
build-push:
21+
strategy:
22+
matrix:
23+
include:
24+
- arch: amd64
25+
platform: linux/amd64
26+
runner: ubuntu-24.04
27+
- arch: aarch64
28+
platform: linux/aarch64
29+
runner: ubuntu-24.04-arm
30+
runs-on: ${{ matrix.runner }}
2231
steps:
2332
- uses: actions/checkout@v5
2433
with:
@@ -43,59 +52,21 @@ jobs:
4352
run: |
4453
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
4554
46-
- name: Build and Push Image
55+
- name: Build and Push Image (${{ matrix.arch }})
4756
uses: docker/build-push-action@v6
4857
with:
4958
context: .
5059
file: docker/coolify-helper/Dockerfile
51-
platforms: linux/amd64
60+
platforms: ${{ matrix.platform }}
5261
push: true
5362
tags: |
54-
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
55-
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
56-
labels: |
57-
coolify.managed=true
58-
aarch64:
59-
runs-on: [ self-hosted, arm64 ]
60-
steps:
61-
- uses: actions/checkout@v5
62-
with:
63-
persist-credentials: false
64-
65-
- name: Login to ${{ env.GITHUB_REGISTRY }}
66-
uses: docker/login-action@v3
67-
with:
68-
registry: ${{ env.GITHUB_REGISTRY }}
69-
username: ${{ github.actor }}
70-
password: ${{ secrets.GITHUB_TOKEN }}
71-
72-
- name: Login to ${{ env.DOCKER_REGISTRY }}
73-
uses: docker/login-action@v3
74-
with:
75-
registry: ${{ env.DOCKER_REGISTRY }}
76-
username: ${{ secrets.DOCKER_USERNAME }}
77-
password: ${{ secrets.DOCKER_TOKEN }}
78-
79-
- name: Get Version
80-
id: version
81-
run: |
82-
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
83-
84-
- name: Build and Push Image
85-
uses: docker/build-push-action@v6
86-
with:
87-
context: .
88-
file: docker/coolify-helper/Dockerfile
89-
platforms: linux/aarch64
90-
push: true
91-
tags: |
92-
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
93-
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
63+
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-${{ matrix.arch }}
64+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-${{ matrix.arch }}
9465
labels: |
9566
coolify.managed=true
9667
merge-manifest:
97-
runs-on: ubuntu-latest
98-
needs: [ amd64, aarch64 ]
68+
runs-on: ubuntu-24.04
69+
needs: build-push
9970
steps:
10071
- uses: actions/checkout@v5
10172
with:
@@ -125,14 +96,16 @@ jobs:
12596
- name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
12697
run: |
12798
docker buildx imagetools create \
128-
--append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
99+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-amd64 \
100+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
129101
--tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
130102
--tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
131103
132104
- name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
133105
run: |
134106
docker buildx imagetools create \
135-
--append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
107+
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-amd64 \
108+
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
136109
--tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
137110
--tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
138111

‎.github/workflows/coolify-production-build.yml‎

Lines changed: 21 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,17 @@ env:
2424
IMAGE_NAME: "coollabsio/coolify"
2525

2626
jobs:
27-
amd64:
28-
runs-on: ubuntu-latest
27+
build-push:
28+
strategy:
29+
matrix:
30+
include:
31+
- arch: amd64
32+
platform: linux/amd64
33+
runner: ubuntu-24.04
34+
- arch: aarch64
35+
platform: linux/aarch64
36+
runner: ubuntu-24.04-arm
37+
runs-on: ${{ matrix.runner }}
2938
steps:
3039
- uses: actions/checkout@v5
3140
with:
@@ -50,57 +59,20 @@ jobs:
5059
run: |
5160
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
5261
53-
- name: Build and Push Image
62+
- name: Build and Push Image (${{ matrix.arch }})
5463
uses: docker/build-push-action@v6
5564
with:
5665
context: .
5766
file: docker/production/Dockerfile
58-
platforms: linux/amd64
67+
platforms: ${{ matrix.platform }}
5968
push: true
6069
tags: |
61-
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
62-
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
63-
64-
aarch64:
65-
runs-on: [self-hosted, arm64]
66-
steps:
67-
- uses: actions/checkout@v5
68-
with:
69-
persist-credentials: false
70-
71-
- name: Login to ${{ env.GITHUB_REGISTRY }}
72-
uses: docker/login-action@v3
73-
with:
74-
registry: ${{ env.GITHUB_REGISTRY }}
75-
username: ${{ github.actor }}
76-
password: ${{ secrets.GITHUB_TOKEN }}
77-
78-
- name: Login to ${{ env.DOCKER_REGISTRY }}
79-
uses: docker/login-action@v3
80-
with:
81-
registry: ${{ env.DOCKER_REGISTRY }}
82-
username: ${{ secrets.DOCKER_USERNAME }}
83-
password: ${{ secrets.DOCKER_TOKEN }}
84-
85-
- name: Get Version
86-
id: version
87-
run: |
88-
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
89-
90-
- name: Build and Push Image
91-
uses: docker/build-push-action@v6
92-
with:
93-
context: .
94-
file: docker/production/Dockerfile
95-
platforms: linux/aarch64
96-
push: true
97-
tags: |
98-
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
99-
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
70+
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-${{ matrix.arch }}
71+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-${{ matrix.arch }}
10072
10173
merge-manifest:
102-
runs-on: ubuntu-latest
103-
needs: [amd64, aarch64]
74+
runs-on: ubuntu-24.04
75+
needs: build-push
10476
steps:
10577
- uses: actions/checkout@v5
10678
with:
@@ -130,14 +102,16 @@ jobs:
130102
- name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
131103
run: |
132104
docker buildx imagetools create \
133-
--append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
105+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-amd64 \
106+
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
134107
--tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
135108
--tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
136109
137110
- name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
138111
run: |
139112
docker buildx imagetools create \
140-
--append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
113+
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-amd64 \
114+
${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
141115
--tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
142116
--tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
143117

0 commit comments

Comments
 (0)