Skip to content

Commit 7aa60ad

Browse files
peaklabs-devpeaklabs-dev
authored
Merge branch 'new-services' into upgrade_authentik
2 parents 611e80c + a2cfa14 commit 7aa60ad

File tree

507 files changed

+17821
-6389
lines changed

Some content is hidden

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

507 files changed

+17821
-6389
lines changed

‎.env.development.example

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,34 @@
1-
APP_NAME=Coolify-localhost
2-
APP_ID=development
1+
# Coolify Configuration
32
APP_ENV=local
3+
APP_NAME="Coolify Development"
4+
APP_ID=development
45
APP_KEY=
5-
APP_DEBUG=true
66
APP_URL=http://localhost
77
APP_PORT=8000
8-
MUX_ENABLED=false
8+
APP_DEBUG=true
9+
SSH_MUX_ENABLED=true
10+
11+
# PostgreSQL Database Configuration
12+
DB_DATABASE=coolify
13+
DB_USERNAME=coolify
14+
DB_PASSWORD=password
15+
DB_HOST=host.docker.internal
16+
DB_PORT=5432
17+
18+
# Ray Configuration
19+
# Set to true to enable Ray
20+
RAY_ENABLED=false
21+
# Set custom ray port
22+
# RAY_PORT=
23+
24+
# Enable Laravel Telescope for debugging
25+
TELESCOPE_ENABLED=false
926

27+
# Selenium Driver URL for Dusk
1028
DUSK_DRIVER_URL=http://selenium:4444
1129

12-
## For Andras only
13-
# To purge cache
30+
# Special Keys for Andras
31+
# For cache purging
1432
BUNNY_API_KEY=
15-
# To upload assets
33+
# For asset uploads
1634
BUNNY_STORAGE_API_KEY=

‎.env.production

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
# Coolify Configuration
12
APP_ID=
23
APP_NAME=Coolify
34
APP_KEY=
45

6+
# PostgreSQL Database Configuration
7+
DB_USERNAME=coolify
58
DB_PASSWORD=
9+
10+
# Redis Configuration
611
REDIS_PASSWORD=
712

13+
# Pusher Configuration
814
PUSHER_APP_ID=
915
PUSHER_APP_KEY=
1016
PUSHER_APP_SECRET=

‎.github/ISSUE_TEMPLATE/01_BUG_REPORT.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: 🐞 Bug Report
2+
description: "File a new bug report."
3+
title: "[Bug]: "
4+
labels: ["🐛 Bug", "🔍 Triage"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
> [!IMPORTANT]
10+
> **Please ensure you are using the latest version of Coolify before submitting an issue, as the bug may have already been fixed in a recent update.** (Of course, if you're experiencing an issue on the latest version that wasn't present in a previous version, please let us know.)
11+
12+
# 💎 Bounty Program (with [algora.io](https://console.algora.io/org/coollabsio/bounties/new))
13+
- If you would like to prioritize the issue resolution, consider adding a bounty to this issue through our [Bounty Program](https://console.algora.io/org/coollabsio/bounties/new).
14+
15+
- type: textarea
16+
attributes:
17+
label: Error Message and Logs
18+
description: Provide a detailed description of the error or exception you encountered, along with any relevant log output.
19+
validations:
20+
required: true
21+
22+
- type: textarea
23+
attributes:
24+
label: Steps to Reproduce
25+
description: Please provide a step-by-step guide to reproduce the issue. Be as detailed as possible, otherwise we may not be able to assist you.
26+
value: |
27+
1.
28+
2.
29+
3.
30+
4.
31+
validations:
32+
required: true
33+
34+
- type: input
35+
attributes:
36+
label: Example Repository URL
37+
description: If applicable, provide a URL to a repository demonstrating the issue.
38+
39+
- type: input
40+
attributes:
41+
label: Coolify Version
42+
description: Please provide the Coolify version you are using. This can be found in the top left corner of your Coolify dashboard.
43+
placeholder: "v4.0.0-beta.335"
44+
validations:
45+
required: true
46+
47+
- type: dropdown
48+
attributes:
49+
label: Are you using Coolify Cloud?
50+
options:
51+
- "No (self-hosted)"
52+
- "Yes (Coolify Cloud)"
53+
validations:
54+
required: true
55+
56+
- type: input
57+
attributes:
58+
label: Operating System and Version (self-hosted)
59+
description: Run `cat /etc/os-release` or `lsb_release -a` in your terminal and provide the operating system and version.
60+
placeholder: "Ubuntu 22.04"
61+
62+
- type: textarea
63+
attributes:
64+
label: Additional Information
65+
description: Any other relevant details about the issue.

‎.github/ISSUE_TEMPLATE/02_ENHANCEMENT_BOUNTY.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: 💎 Enhancement Bounty
2+
description: "Propose a new feature, service, or improvement with an attached bounty."
3+
title: "[Enhancement]: "
4+
labels: ["✨ Enhancement", "🔍 Triage"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
> [!IMPORTANT]
10+
> **This issue template is exclusively for proposing new features, services, or improvements with an attached bounty.** Enhancements without a bounty can be discussed in the appropriate category of [Github Discussions](https://github.com/coollabsio/coolify/discussions).
11+
12+
# 💎 Add a Bounty (with [algora.io](https://console.algora.io/org/coollabsio/bounties/new))
13+
- [Click here to add the required bounty](https://console.algora.io/org/coollabsio/bounties/new)
14+
15+
- type: dropdown
16+
attributes:
17+
label: Request Type
18+
description: Select the type of request you are making.
19+
options:
20+
- New Feature
21+
- New Service
22+
- Improvement
23+
validations:
24+
required: true
25+
26+
- type: textarea
27+
attributes:
28+
label: Description
29+
description: Provide a detailed description of the feature, improvement, or service you are proposing.
30+
validations:
31+
required: true

‎.github/ISSUE_TEMPLATE/BUG_REPORT.yml

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

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
blank_issues_enabled: false
2+
23
contact_links:
3-
- name: 🤔 Community Support (Chat)
4+
- name: 🤔 Questions and Community Support
45
url: https://coollabs.io/discord
5-
about: Reach out to us on Discord.
6-
- name: 🙋‍♂️ Feature Requests
7-
url: https://github.com/coollabsio/coolify/discussions/categories/new-features
8-
about: All feature requests will be discussed here.
6+
about: If you have any questions, reach out to us on Discord inside the "#support" channel.
7+
8+
- name: 💡 Feature Request
9+
url: https://github.com/coollabsio/coolify/discussions/categories/feature-requests
10+
about: Suggest a new feature for Coolify.
11+
12+
- name: ⚙️ Service Request
13+
url: https://github.com/coollabsio/coolify/discussions/categories/service-requests
14+
about: Request a new service integration for Coolify.
15+
16+
- name: 🔧 Improvements
17+
url: https://github.com/coollabsio/coolify/discussions/categories/improvements
18+
about: Suggest improvements to existing features for Coolify.

‎.github/pull_request_template.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1-
> Always use `next` branch as destination branch for PRs, not `main`
1+
## Submit Checklist (REMOVE THIS SECTION BEFORE SUBMITTING)
2+
- [ ] I have selected the `next` branch as the destination for my PR, not `main`.
3+
- [ ] I have listed all changes in the `Changes` section.
4+
- [ ] I have filled out the `Issues` section with the issue/discussion link(s) (if applicable).
5+
- [ ] I have tested my changes.
6+
- [ ] I have considered backwards compatibility.
7+
- [ ] I have removed this checklist and any unused sections.
8+
9+
## Changes
10+
-
11+
12+
## Issues
13+
- fix #

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

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ jobs:
2525
registry: ${{ env.REGISTRY }}
2626
username: ${{ github.actor }}
2727
password: ${{ secrets.GITHUB_TOKEN }}
28+
- name: Get Version
29+
id: version
30+
run: |
31+
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
2832
- name: Build image and push to registry
2933
uses: docker/build-push-action@v5
3034
with:
@@ -33,7 +37,9 @@ jobs:
3337
file: docker/coolify-helper/Dockerfile
3438
platforms: linux/amd64
3539
push: true
36-
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
40+
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
41+
labels: |
42+
coolify.managed=true
3743
aarch64:
3844
runs-on: [ self-hosted, arm64 ]
3945
permissions:
@@ -47,6 +53,10 @@ jobs:
4753
registry: ${{ env.REGISTRY }}
4854
username: ${{ github.actor }}
4955
password: ${{ secrets.GITHUB_TOKEN }}
56+
- name: Get Version
57+
id: version
58+
run: |
59+
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
5060
- name: Build image and push to registry
5161
uses: docker/build-push-action@v5
5262
with:
@@ -55,7 +65,9 @@ jobs:
5565
file: docker/coolify-helper/Dockerfile
5666
platforms: linux/aarch64
5767
push: true
58-
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64
68+
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
69+
labels: |
70+
coolify.managed=true
5971
merge-manifest:
6072
runs-on: ubuntu-latest
6173
permissions:
@@ -75,10 +87,15 @@ jobs:
7587
registry: ${{ env.REGISTRY }}
7688
username: ${{ github.actor }}
7789
password: ${{ secrets.GITHUB_TOKEN }}
90+
- name: Get Version
91+
id: version
92+
run: |
93+
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
7894
- name: Create & publish manifest
7995
run: |
80-
docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
96+
docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
8197
- uses: sarisia/actions-status-discord@v1
8298
if: always()
8399
with:
84100
webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL }}
101+

‎.github/workflows/coolify-helper.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ jobs:
2525
registry: ${{ env.REGISTRY }}
2626
username: ${{ github.actor }}
2727
password: ${{ secrets.GITHUB_TOKEN }}
28+
- name: Get Version
29+
id: version
30+
run: |
31+
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
2832
- name: Build image and push to registry
2933
uses: docker/build-push-action@v5
3034
with:
@@ -33,7 +37,9 @@ jobs:
3337
file: docker/coolify-helper/Dockerfile
3438
platforms: linux/amd64
3539
push: true
36-
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
40+
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
41+
labels: |
42+
coolify.managed=true
3743
aarch64:
3844
runs-on: [ self-hosted, arm64 ]
3945
permissions:
@@ -47,6 +53,10 @@ jobs:
4753
registry: ${{ env.REGISTRY }}
4854
username: ${{ github.actor }}
4955
password: ${{ secrets.GITHUB_TOKEN }}
56+
- name: Get Version
57+
id: version
58+
run: |
59+
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
5060
- name: Build image and push to registry
5161
uses: docker/build-push-action@v5
5262
with:
@@ -55,7 +65,9 @@ jobs:
5565
file: docker/coolify-helper/Dockerfile
5666
platforms: linux/aarch64
5767
push: true
58-
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64
68+
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
69+
labels: |
70+
coolify.managed=true
5971
merge-manifest:
6072
runs-on: ubuntu-latest
6173
permissions:
@@ -75,10 +87,15 @@ jobs:
7587
registry: ${{ env.REGISTRY }}
7688
username: ${{ github.actor }}
7789
password: ${{ secrets.GITHUB_TOKEN }}
90+
- name: Get Version
91+
id: version
92+
run: |
93+
echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
7894
- name: Create & publish manifest
7995
run: |
80-
docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
96+
docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
8197
- uses: sarisia/actions-status-discord@v1
8298
if: always()
8399
with:
84100
webhook: ${{ secrets.DISCORD_WEBHOOK_PROD_RELEASE_CHANNEL }}
101+

0 commit comments

Comments
 (0)