Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4.0.0-beta.368 #4246

Merged
merged 175 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
e2db5e0
fix: show proper error message on invalid Git source
matpratta Jun 16, 2024
e5da464
fix: convert HTTP to SSH source when using deploy key on GitHub
matpratta Jun 16, 2024
f2656e4
Update schema of private keys by id response
marconneves Nov 3, 2024
4a6df8b
fix: update schema in code decorator
marconneves Nov 3, 2024
752ae4a
add feedback on docker version check failure
easilok Nov 5, 2024
3fe636a
update docker minimum version to 26
easilok Nov 7, 2024
88e6c04
Fixes: https://github.com/coollabsio/coolify/issues/4186
Nov 8, 2024
8ddc5d6
Merge branch 'next' into fix/gitlab-empty-webhook-secret
quarkcore Nov 8, 2024
770163d
using docker version constant as user feedback
easilok Nov 10, 2024
ee2b957
validating minimum docker version with less that
easilok Nov 10, 2024
7ead0e5
remove unused files
peaklabs-dev Nov 11, 2024
ee049d6
Update vite.config.js
peaklabs-dev Nov 11, 2024
4736536
Delete .gitpod.yml
peaklabs-dev Nov 11, 2024
9bd1753
add new ignore paths to vite
peaklabs-dev Nov 11, 2024
026fcda
remove unused packages and add new tailwind scrollbar package
peaklabs-dev Nov 11, 2024
2c0eb6c
Update SECURITY.md
peaklabs-dev Nov 11, 2024
435b0f8
Update tailwind.config.js
peaklabs-dev Nov 11, 2024
a9101c3
Update versions.json
peaklabs-dev Nov 11, 2024
3d01e4f
Update SECURITY.md
peaklabs-dev Nov 11, 2024
9a325c6
Update SECURITY.md
peaklabs-dev Nov 11, 2024
1e72ac7
Update RELEASE.md
peaklabs-dev Nov 11, 2024
4facf58
Update README.md
peaklabs-dev Nov 11, 2024
a4eab9e
Update README.md
peaklabs-dev Nov 11, 2024
d994f9a
chore: update dep
peaklabs-dev Nov 11, 2024
55675d5
Update openapi.yaml
peaklabs-dev Nov 11, 2024
3785ccf
upgrade openapi version
peaklabs-dev Nov 11, 2024
930f4b5
Update openapi.yaml
peaklabs-dev Nov 11, 2024
1cb9c77
fix naming mismatch
peaklabs-dev Nov 11, 2024
30fa320
pin redis version
peaklabs-dev Nov 11, 2024
a65bf58
Update docker-compose.dev.yml
peaklabs-dev Nov 11, 2024
10fa859
Update docker-compose.windows.yml
peaklabs-dev Nov 11, 2024
1a3b01f
Update package-lock.json
peaklabs-dev Nov 11, 2024
1709126
Delete generate_pg_data.sh
peaklabs-dev Nov 11, 2024
eeb6330
remove unused dev files
peaklabs-dev Nov 11, 2024
644da63
Revert "remove unused dev files"
peaklabs-dev Nov 11, 2024
7e8e652
Update composer.json
peaklabs-dev Nov 11, 2024
22042d5
Update composer.json
peaklabs-dev Nov 11, 2024
5216ffb
update composer dep
peaklabs-dev Nov 11, 2024
a43c12c
Merge branch 'next' into dep-and-remove-unused-stuff
peaklabs-dev Nov 11, 2024
1faa8be
fix: cloud + stripe related
andrasbacsai Nov 11, 2024
c6315f6
version++
andrasbacsai Nov 11, 2024
d7cde67
feat: check local horizon scheduler deployments
andrasbacsai Nov 11, 2024
b58cc05
fix: terminal view loading in async
andrasbacsai Nov 12, 2024
f14cef0
fix: cool 500 error (thanks hugodos)
andrasbacsai Nov 12, 2024
f0985a7
fix horizon command name
andrasbacsai Nov 12, 2024
da9c8ee
Merge pull request #4194 from quarkcore/fix/gitlab-empty-webhook-secret
andrasbacsai Nov 12, 2024
8e40603
remove ray
andrasbacsai Nov 12, 2024
7952dae
Merge pull request #4119 from marconneves/next
andrasbacsai Nov 12, 2024
99705ee
fix description
andrasbacsai Nov 12, 2024
0ab77c3
fix: openapi docs
andrasbacsai Nov 12, 2024
4a2846f
Merge branch 'next' into feat/convert-http-to-ssh-sources-with-deploy…
andrasbacsai Nov 12, 2024
327b430
fix: add tests for git url converts
andrasbacsai Nov 12, 2024
923cfd1
Merge pull request #2568 from matpratta/feat/convert-http-to-ssh-sour…
andrasbacsai Nov 12, 2024
ad775ba
Merge branch 'next' into fix/improved-responses-on-git-error
andrasbacsai Nov 12, 2024
ff016cb
pint
andrasbacsai Nov 12, 2024
5839878
Merge pull request #2567 from matpratta/fix/improved-responses-on-git…
andrasbacsai Nov 12, 2024
e00c692
ui: separate resources by type in projects view
andrasbacsai Nov 12, 2024
9a93309
fix: minio / logto url generation
andrasbacsai Nov 12, 2024
2381eb9
fix: admin view
andrasbacsai Nov 12, 2024
d2af473
Merge branch 'main' into next
andrasbacsai Nov 12, 2024
99eaedf
ui: improve s3 add view
andrasbacsai Nov 12, 2024
0ce2fbf
Merge pull request #4169 from easilok/fix-invalid-docker-version-check
peaklabs-dev Nov 12, 2024
408ba9c
fix docker minimum version
peaklabs-dev Nov 12, 2024
7253041
feat: add internal api docs to /docs/api with auth
andrasbacsai Nov 12, 2024
14c334b
fix: min docker version 26
andrasbacsai Nov 12, 2024
442b0e8
Merge branch 'next' into dep-and-remove-unused-stuff
peaklabs-dev Nov 12, 2024
055c613
feat: add proxy type change to create/update apis
andrasbacsai Nov 12, 2024
ed9fd07
Merge branch 'next' into dep-and-remove-unused-stuff
peaklabs-dev Nov 12, 2024
290cb45
fix: pull latest service-templates.json on init
andrasbacsai Nov 12, 2024
3c6b825
fix: workflow files for coolify build
andrasbacsai Nov 12, 2024
e10d2ad
just test
andrasbacsai Nov 12, 2024
ac598b3
it works
andrasbacsai Nov 12, 2024
1c5ddab
use one constants file
peaklabs-dev Nov 12, 2024
2ffc9da
new constants file
peaklabs-dev Nov 12, 2024
a4f56fb
Merge branch 'dep-and-remove-unused-stuff' of https://github.com/peak…
peaklabs-dev Nov 12, 2024
dd2f327
Merge branch 'main' into next
peaklabs-dev Nov 12, 2024
8992b45
Merge branch 'next' into dep-and-remove-unused-stuff
peaklabs-dev Nov 12, 2024
d3f4e0a
Delete CheckResaleLicense.php
peaklabs-dev Nov 12, 2024
97f868a
Delete bootstrap.js
peaklabs-dev Nov 12, 2024
1ffa88a
use config instead of env()
peaklabs-dev Nov 12, 2024
1d517b4
remove some unused files
peaklabs-dev Nov 12, 2024
b810a96
Update web.php
peaklabs-dev Nov 12, 2024
2344267
Update .gitattributes
peaklabs-dev Nov 12, 2024
403b692
fix: autocompletes
LEstradioto Nov 12, 2024
3f49056
remove user as there is no envs here anymore
peaklabs-dev Nov 12, 2024
90130d0
Merge pull request #4259 from LEstradioto/fix-autocompletes
peaklabs-dev Nov 12, 2024
2ccdbe8
update terminal dep
peaklabs-dev Nov 13, 2024
50e09b6
Merge branch 'next' into dep-and-remove-unused-stuff
peaklabs-dev Nov 13, 2024
6ed9259
Correct tab name
ptrsmk Nov 13, 2024
fb12540
Merge pull request #4268 from ptrsmk/patch-1
peaklabs-dev Nov 13, 2024
9d021f6
new docker version
peaklabs-dev Nov 13, 2024
0e7a1fe
Update .gitignore
peaklabs-dev Nov 13, 2024
4117d93
new dockerfile
peaklabs-dev Nov 13, 2024
5b5f583
enable opcache and combine run commands
peaklabs-dev Nov 13, 2024
bb6315d
add config cache
peaklabs-dev Nov 13, 2024
36e4979
only copy needed files into prod image
peaklabs-dev Nov 13, 2024
5972ba7
Update Dockerfile
peaklabs-dev Nov 13, 2024
72f344e
added comments
peaklabs-dev Nov 13, 2024
a399f41
switch user
peaklabs-dev Nov 13, 2024
162797a
bump dep
peaklabs-dev Nov 13, 2024
52e93ec
bump compose dep
peaklabs-dev Nov 13, 2024
725de2f
dep bum dockerfile
peaklabs-dev Nov 13, 2024
07c8ec2
Update Dockerfile
peaklabs-dev Nov 13, 2024
65255a2
bump dev dep
peaklabs-dev Nov 13, 2024
8fc6ffc
bump testing host dep
peaklabs-dev Nov 13, 2024
23ee1a0
bump helper dep
peaklabs-dev Nov 13, 2024
94be546
Update install.sh
peaklabs-dev Nov 13, 2024
70cd88a
Merge branch 'next' into dep-and-remove-unused-stuff
peaklabs-dev Nov 13, 2024
9343cd6
add config cache
peaklabs-dev Nov 13, 2024
f55bb5b
remove resale license
peaklabs-dev Nov 13, 2024
15abd39
disable waitlist
peaklabs-dev Nov 13, 2024
1be3423
Delete license.blade.php
peaklabs-dev Nov 13, 2024
85c2345
fix coolify always in cloud mode
peaklabs-dev Nov 13, 2024
8cf7dd8
Merge branch 'new-dockerfiles' into dep-and-remove-unused-stuff
peaklabs-dev Nov 13, 2024
689396f
use old user here
peaklabs-dev Nov 13, 2024
5809623
Update run
peaklabs-dev Nov 13, 2024
24f357a
Update install.sh
peaklabs-dev Nov 13, 2024
bff8e6b
Expanded checkbox clickable area to include label.
Bilge Nov 13, 2024
021312e
Merge pull request #4273 from Bilge/checkbox
peaklabs-dev Nov 13, 2024
3bfa21b
fix confirmation setting UI
peaklabs-dev Nov 13, 2024
b0b81e4
fix: timezone settings validation
andrasbacsai Nov 14, 2024
8a917f6
fix: invalid tz should not prevent other jobs to be executed
andrasbacsai Nov 14, 2024
e93a384
Update .gitattributes
peaklabs-dev Nov 14, 2024
c324f38
Update README.md
peaklabs-dev Nov 14, 2024
d067895
fix: testing-host should be built locally
andrasbacsai Nov 14, 2024
744e118
Update install.sh
peaklabs-dev Nov 14, 2024
acfcf88
Merge branch 'next' into fix-install-scirpt-root-and-storage
peaklabs-dev Nov 14, 2024
bf6222e
fix ghost
peaklabs-dev Nov 14, 2024
552f563
fix: poll with modal issue
andrasbacsai Nov 14, 2024
c9f7863
Merge pull request #4238 from peaklabs-dev/dep-and-remove-unused-stuff
andrasbacsai Nov 14, 2024
b0f3f53
fix: terminal opening issue
andrasbacsai Nov 14, 2024
a77ed93
fix: if service img not found, use github as a source
andrasbacsai Nov 14, 2024
33183ab
fix: fallback to local coolify.png
andrasbacsai Nov 14, 2024
7a16691
fixes for installation script
andrasbacsai Nov 14, 2024
3a46423
Merge pull request #4284 from peaklabs-dev/fix-install-scirpt-root-an…
andrasbacsai Nov 14, 2024
5d5ac6b
Update upgrade.blade.php
peaklabs-dev Nov 14, 2024
7ec6f63
Update upgrade.blade.php
peaklabs-dev Nov 14, 2024
3e6f4c8
Merge branch 'next' into fix-installer-on-pi
andrasbacsai Nov 14, 2024
2c91c46
fix: gather private ips
andrasbacsai Nov 14, 2024
4f15ffa
Merge pull request #4274 from peaklabs-dev/fix-installer-on-pi
andrasbacsai Nov 14, 2024
0e82b82
Merge pull request #4285 from peaklabs-dev/add-warning
andrasbacsai Nov 14, 2024
3ecda1b
fix: cf tunnel menu should be visible when server is not validated
andrasbacsai Nov 14, 2024
a2c0b68
fix validation
peaklabs-dev Nov 14, 2024
ca4b91c
Update ByIp.php
peaklabs-dev Nov 14, 2024
465dfbd
fix check if IP is already in used in this team
peaklabs-dev Nov 14, 2024
df1682a
Merge branch 'next' into fix-server-ip-valdiation
peaklabs-dev Nov 14, 2024
b18d4b9
dispatch an error message
peaklabs-dev Nov 14, 2024
020ad0d
Merge branch 'fix-server-ip-valdiation' of https://github.com/peaklab…
peaklabs-dev Nov 14, 2024
0a36fbd
Revert "dispatch an error message"
peaklabs-dev Nov 14, 2024
b282c1f
fix backup job without s3 can not be added
peaklabs-dev Nov 14, 2024
67bd06d
fix s3 is always set to true if you make an error like invalid cron
peaklabs-dev Nov 14, 2024
4cc4e28
fix clear frequency on exit and error
peaklabs-dev Nov 14, 2024
e66e590
Fix for the XSS vulnerability
retrymp3 Nov 14, 2024
3c087f3
Update install.sh
NexiaMoe Nov 14, 2024
0f4dbae
Merge branch 'next' into fix-backups
peaklabs-dev Nov 14, 2024
36fd0b1
Merge pull request #4289 from NexiaMoe/fix-fedora-dnf5
peaklabs-dev Nov 14, 2024
a58125c
fix same ssh key in different teams
peaklabs-dev Nov 14, 2024
9e7a9f6
fix install openssl
peaklabs-dev Nov 14, 2024
fba1242
Merge pull request #4288 from retrymp3/XSS-vuln-fix
andrasbacsai Nov 14, 2024
0e8f5d6
fix
andrasbacsai Nov 15, 2024
825e8c6
hmm
andrasbacsai Nov 15, 2024
477a453
fix: deployment optimizations
andrasbacsai Nov 15, 2024
4053c30
fix
andrasbacsai Nov 15, 2024
210a428
fix: init script + optimize laravel
andrasbacsai Nov 15, 2024
469e009
Merge pull request #4287 from peaklabs-dev/fix-backups
andrasbacsai Nov 15, 2024
50cb303
Merge pull request #4286 from peaklabs-dev/fix-server-ip-valdiation
andrasbacsai Nov 15, 2024
72909d6
Merge pull request #4293 from peaklabs-dev/fix-install-openssl
andrasbacsai Nov 15, 2024
9d86198
Merge pull request #4291 from peaklabs-dev/fix-same-ssh-key-other-team
andrasbacsai Nov 15, 2024
9982a93
fix: default docker engine version + fix install script
andrasbacsai Nov 15, 2024
29a82ae
fix
andrasbacsai Nov 15, 2024
0045c5b
fix browserless
peaklabs-dev Nov 15, 2024
c9babe0
fix: pull helper image on init
andrasbacsai Nov 15, 2024
2932d9a
fix ssh key migration broken with the new team check
peaklabs-dev Nov 15, 2024
2737da1
Merge branch 'next' of https://github.com/coollabsio/coolify into next
peaklabs-dev Nov 15, 2024
09ec4fd
fix: SPA static site default nginx conf
andrasbacsai Nov 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

/.github export-ignore
CHANGELOG.md export-ignore
.styleci.yml export-ignore
.styleci.yml export-ignore
2 changes: 1 addition & 1 deletion .github/workflows/coolify-production-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- docker/coolify-helper/Dockerfile
- docker/coolify-realtime/Dockerfile
- docker/testing-host/Dockerfile
- templates/*
- templates/**

env:
GITHUB_REGISTRY: ghcr.io
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coolify-staging-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- docker/coolify-helper/Dockerfile
- docker/coolify-realtime/Dockerfile
- docker/testing-host/Dockerfile
- templates/*
- templates/**

env:
GITHUB_REGISTRY: ghcr.io
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ scripts/load-test/*
.ignition.json
.env.dusk.local
docker/coolify-realtime/node_modules
.DS_Store
65 changes: 0 additions & 65 deletions .gitpod.yml

This file was deleted.

11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
```
You can find the installation script source [here](./scripts/install.sh).

> [!NOTE]
> Please refer to the [docs](https://coolify.io/docs/installation) for more information about the installation.

# Support

Contact us at [coolify.io/docs/contact](https://coolify.io/docs/contact).
Expand Down Expand Up @@ -121,7 +124,6 @@ By subscribing to the cloud version, you get the Coolify server for the same pri
- Better support
- Less maintenance for you


# Recognitions

<p>
Expand All @@ -138,6 +140,13 @@ By subscribing to the cloud version, you get the Coolify server for the same pri

<a href="https://trendshift.io/repositories/634" target="_blank"><img src="https://trendshift.io/api/badge/repositories/634" alt="coollabsio%2Fcoolify | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>

# Core Maintainers

| Andras Bacsai | Peak |
|------------|------------|
| <img src="https://github.com/andrasbacsai.png" width="200px" alt="Andras Bacsai" /> | <img src="https://github.com/peaklabs-dev.png" width="200px" alt="Peak Labs" /> |
| <a href="https://x.com/heyandras"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Twitter.svg" width="25px"></a> <a href="https://github.com/andrasbacsai"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Github.svg" width="25px"></a> | <a href="https://x.com/peaklabs_dev"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Twitter.svg" width="25px"></a> <a href="https://github.com/peaklabs-dev"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Github.svg" width="25px"></a> |

# Repo Activity

![Alt](https://repobeats.axiom.co/api/embed/eab1c8066f9c59d0ad37b76c23ebb5ccac4278ae.svg "Repobeats analytics image")
Expand Down
33 changes: 18 additions & 15 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Coolify Release Guide

This guide outlines the release process for Coolify, intended for developers and those interested in understanding how releases are managed and deployed.
This guide outlines the release process for Coolify, intended for developers and those interested in understanding how Coolify releases are managed and deployed.

## Table of Contents
- [Release Process](#release-process)
Expand All @@ -19,30 +19,30 @@ This guide outlines the release process for Coolify, intended for developers and
- Improvements, fixes, and new features are developed on the `next` branch or separate feature branches.

2. **Merging to `main`**
- Once ready, changes are merged from the `next` branch into the `main` branch.
- Once ready, changes are merged from the `next` branch into the `main` branch (via a pull request).

3. **Building the Release**
- After merging to `main`, GitHub Actions automatically builds release images for all architectures and pushes them to the GitHub Container Registry with the version tag and the `latest` tag.
- After merging to `main`, GitHub Actions automatically builds release images for all architectures and pushes them to the GitHub Container Registry and Docker Hub with the specific version tag and the `latest` tag.

4. **Creating a GitHub Release**
- A new GitHub release is manually created with details of the changes made in the version.

5. **Updating the CDN**
- To make a new version publicly available, the version information on the CDN needs to be updated: [https://cdn.coollabs.io/coolify/versions.json](https://cdn.coollabs.io/coolify/versions.json)
- To make a new version publicly available, the version information on the CDN needs to be updated manually. After that the new version number will be available at [https://cdn.coollabs.io/coolify/versions.json](https://cdn.coollabs.io/coolify/versions.json).

> [!NOTE]
> The CDN update may not occur immediately after the GitHub release. It can take hours or even days due to additional testing, stability checks, or potential hotfixes. **The update becomes available only after the CDN is updated.**
> The CDN update may not occur immediately after the GitHub release. It can take hours or even days due to additional testing, stability checks, or potential hotfixes. **The update becomes available only after the CDN is updated. After the CDN is updated, a discord announcement will be made in the Production Release channel.**

## Version Types

<details>
<summary><strong>Stable (coming soon)</strong></summary>

- **Stable**
- The production version suitable for stable, production environments (generally recommended).
- **Update Frequency:** Every 2 to 4 weeks, with more frequent possible hotfixes.
- The production version suitable for stable, production environments (recommended).
- **Update Frequency:** Every 2 to 4 weeks, with more frequent possible fixes.
- **Release Size:** Larger but less frequent releases. Multiple nightly versions are consolidated into a single stable release.
- **Versioning Scheme:** Follows semantic versioning (e.g., `v4.0.0`).
- **Versioning Scheme:** Follows semantic versioning (e.g., `v4.0.0`, `4.1.0`, etc.).
- **Installation Command:**
```bash
curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
Expand All @@ -57,7 +57,7 @@ This guide outlines the release process for Coolify, intended for developers and
- The latest development version, suitable for testing the latest changes and experimenting with new features.
- **Update Frequency:** Daily or bi-weekly updates.
- **Release Size:** Smaller, more frequent releases.
- **Versioning Scheme:** TO BE DETERMINED
- **Versioning Scheme:** Follows semantic versioning (e.g., `4.1.0-nightly.1`, `4.1.0-nightly.2`, etc.).
- **Installation Command:**
```bash
curl -fsSL https://cdn.coollabs.io/coolify-nightly/install.sh | bash -s next
Expand All @@ -73,11 +73,11 @@ This guide outlines the release process for Coolify, intended for developers and
- **Purpose:** Allows users to test and provide feedback on new features and changes before they become stable.
- **Update Frequency:** Available if we think beta testing is necessary.
- **Release Size:** Same size as stable release as it will become the next stabe release after some time.
- **Versioning Scheme:** Follows semantic versioning (e.g., `4.1.0-beta.1`).
- **Versioning Scheme:** Follows semantic versioning (e.g., `4.1.0-beta.1`, `4.1.0-beta.2`, etc.).
- **Installation Command:**
```bash
```bash
curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
```
```

</details>

Expand Down Expand Up @@ -117,12 +117,15 @@ When a new version is released and a new GitHub release is created, it doesn't i
> [!IMPORTANT]
> The cloud version of Coolify may be several versions behind the latest GitHub releases even if the CDN is updated. This is intentional to ensure stability and reliability for cloud users and Andras will manully update the cloud version when the update is ready.

## Manually Update to Specific Versions
## Manually Update/ Downgrade to Specific Versions

> [!CAUTION]
> Updating to unreleased versions is not recommended and may cause issues. Use at your own risk!
> Updating to unreleased versions is not recommended and can cause issues.

> [!IMPORTANT]
> Downgrading is supported but not recommended and can cause issues because of database migrations and other changes.

To update your Coolify instance to a specific (unreleased) version, use the following command:
To update your Coolify instance to a specific version, use the following command:

```bash
curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash -s <version>
Expand Down
23 changes: 16 additions & 7 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,24 @@

## Supported Versions

Use this section to tell people about which versions of your project are
currently being supported with security updates.
Currently supported, maintained and updated versions:

| Version | Supported |
| ------- | ------------------ |
| > 4 | :white_check_mark: |
| 3 | :x: |
| Version | Supported | Support Status |
| ------- | ------------------ | -------------- |
| 4.x | :white_check_mark: | Active Development & Security Updates |
| < 4.0 | :x: | End of Life (no security updates) |

## Security Updates

We take security seriously. Security updates are released as soon as possible after a vulnerability is discovered and verified.

## Reporting a Vulnerability

If you have any vulnerability please report at [email protected]
If you discover a security vulnerability, please follow these steps:

1. **DO NOT** disclose the vulnerability publicly.
2. Send a detailed report to: `[email protected]`.
3. Include in your report:
- A description of the vulnerability
- Steps to reproduce the issue
- Potential impact
37 changes: 37 additions & 0 deletions app/Actions/Application/IsHorizonQueueEmpty.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php

namespace App\Actions\Application;

use Laravel\Horizon\Contracts\JobRepository;
use Lorisleiva\Actions\Concerns\AsAction;

class IsHorizonQueueEmpty
{
use AsAction;

public function handle()
{
$hostname = gethostname();
$recent = app(JobRepository::class)->getRecent();
if ($recent) {
$running = $recent->filter(function ($job) use ($hostname) {
$payload = json_decode($job->payload);
$tags = data_get($payload, 'tags');

return $job->status != 'completed' &&
$job->status != 'failed' &&
isset($tags) &&
is_array($tags) &&
in_array('server:'.$hostname, $tags);
});
if ($running->count() > 0) {
echo 'false';

return false;
}
}
echo 'true';

return true;
}
}
66 changes: 0 additions & 66 deletions app/Actions/License/CheckResaleLicense.php

This file was deleted.

2 changes: 1 addition & 1 deletion app/Actions/Server/CleanupDocker.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public function handle(Server $server)
{
$settings = instanceSettings();
$helperImageVersion = data_get($settings, 'helper_version');
$helperImage = config('coolify.helper_image');
$helperImage = config('constants.coolify.helper_image');
$helperImageWithVersion = "$helperImage:$helperImageVersion";

$commands = [
Expand Down
2 changes: 1 addition & 1 deletion app/Actions/Server/InstallDocker.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class InstallDocker

public function handle(Server $server)
{
$dockerVersion = config('constants.docker_install_version');
$dockerVersion = config('constants.docker.minimum_required_version');
$supported_os_type = $server->validateOS();
if (! $supported_os_type) {
throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/installation#manually">documentation</a>.');
Expand Down
2 changes: 1 addition & 1 deletion app/Actions/Server/StartLogDrain.php
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public function handle(Server $server)
');
$license_key = $server->settings->logdrain_newrelic_license_key;
$base_uri = $server->settings->logdrain_newrelic_base_uri;
$base_path = config('coolify.base_config_path');
$base_path = config('constants.coolify.base_config_path');

$config_path = $base_path.'/log-drains';
$fluent_bit_config = $config_path.'/fluent-bit.conf';
Expand Down
1 change: 0 additions & 1 deletion app/Console/Commands/CleanupRedis.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class CleanupRedis extends Command

public function handle()
{
echo "Cleanup Redis keys.\n";
$prefix = config('database.redis.options.prefix');

$keys = Redis::connection()->keys('*:laravel*');
Expand Down
1 change: 0 additions & 1 deletion app/Console/Commands/CleanupStuckedResources.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class CleanupStuckedResources extends Command

public function handle()
{
echo "Running cleanup stucked resources.\n";
$this->cleanup_stucked_resources();
}

Expand Down
Loading