Compare commits

...

10 Commits

Author SHA1 Message Date
7edb934d8a Add a deploycyka script
Some checks failed
Staging Build / amd64 (push) Has been cancelled
Staging Build / aarch64 (push) Has been cancelled
Staging Build / merge-manifest (push) Has been cancelled
Lock closed Issues, Discussions, and PRs / lock-threads (push) Has been cancelled
Manage Stale Issues and PRs / manage-stale (push) Has been cancelled
2025-09-26 10:06:18 +02:00
github-actions[bot]
d086f9fc50 docs: update changelog 2025-09-24 18:55:40 +00:00
Andras Bacsai
62447b3456 Merge pull request #6694 from coollabsio/next
v4.0.0-beta.431
2025-09-24 20:55:17 +02:00
Andras Bacsai
22f7a20daa fix(docker): streamline openssh-client installation in Dockerfile
- Removed temporary repository configuration for Alpine v3.21.
- Upgraded system packages and added openssh-client directly to the installation process.
2025-09-24 20:49:49 +02:00
Andras Bacsai
f3164f6ac1 fix(docker): adjust openssh-client installation in Dockerfile to avoid version bug
- Specified installation of openssh-client from Alpine v3.21 to prevent issues with version r8.
- Updated repository configuration to temporarily include v3.21 for this installation.
2025-09-24 20:41:17 +02:00
Andras Bacsai
0a6b2a0586 chore(versions): increment coolify version numbers to 4.0.0-beta.431 and 4.0.0-beta.432 in configuration files 2025-09-24 20:08:51 +02:00
github-actions[bot]
78be85dbbc docs: update changelog 2025-09-24 16:20:52 +00:00
Andras Bacsai
8fa0ba9539 Merge pull request #6691 from coollabsio/next
fix(deployment-job): enhance build time variable analysis
2025-09-24 18:20:31 +02:00
Andras Bacsai
667c8e6432 fix(deployment-job): enhance build time variable analysis
- Introduced logic to filter user-defined build time variables from the database based on the pull request context.
- Improved handling of build time variables to ensure only relevant variables are analyzed, enhancing the deployment process.
2025-09-24 18:19:42 +02:00
github-actions[bot]
7160b88900 docs: update changelog 2025-09-24 15:58:16 +00:00
7 changed files with 72 additions and 6 deletions

View File

@@ -4,6 +4,33 @@ All notable changes to this project will be documented in this file.
## [unreleased]
### 🐛 Bug Fixes
- *(docker)* Adjust openssh-client installation in Dockerfile to avoid version bug
- *(docker)* Streamline openssh-client installation in Dockerfile
### 📚 Documentation
- Update changelog
### ⚙️ Miscellaneous Tasks
- *(versions)* Increment coolify version numbers to 4.0.0-beta.431 and 4.0.0-beta.432 in configuration files
## [4.0.0-beta.430] - 2025-09-24
### 🐛 Bug Fixes
- *(PreviewCompose)* Adds port to preview urls
- *(deployment-job)* Enhance build time variable analysis
### 📚 Documentation
- Update changelog
- Update changelog
## [4.0.0-beta.429] - 2025-09-23
### 🚀 Features
- *(environment)* Replace is_buildtime_only with is_runtime and is_buildtime flags for environment variables, updating related logic and views
@@ -23,6 +50,8 @@ All notable changes to this project will be documented in this file.
- *(cloud-check)* Enhance CloudCheckSubscription command with fix options
- *(stripe)* Enhance subscription handling and verification process
- *(private-key-refresh)* Add refresh dispatch on private key update and connection check
- *(comments)* Add automated comments for labeled pull requests to guide documentation updates
- *(comments)* Ping PR author
### 🐛 Bug Fixes
@@ -42,6 +71,8 @@ All notable changes to this project will be documented in this file.
- *(environment-variables)* Correct method call syntax in analyzeBuildVariable function
- *(clears-global-search-cache)* Refine team retrieval logic in getTeamIdForCache method
- *(subscription-job)* Enhance retry logic for VerifyStripeSubscriptionStatusJob
- *(environment-variable)* Update checkbox visibility and helper text for build and runtime options
- *(deployment-job)* Escape single quotes in build arguments for Docker Compose command
### 🚜 Refactor
@@ -75,6 +106,8 @@ All notable changes to this project will be documented in this file.
### ⚙️ Miscellaneous Tasks
- Change order of runtime and buildtime
- *(docker-compose)* Update soketi image version to 1.0.10 in production and Windows configurations
- *(versions)* Update coolify version numbers to 4.0.0-beta.430 and 4.0.0-beta.431 in configuration files
## [4.0.0-beta.428] - 2025-09-15

View File

@@ -2715,7 +2715,27 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
private function analyzeBuildTimeVariables($variables)
{
$variablesArray = $variables->toArray();
$userDefinedVariables = collect([]);
$dbVariables = $this->pull_request_id === 0
? $this->application->environment_variables()
->where('is_buildtime', true)
->pluck('key')
: $this->application->environment_variables_preview()
->where('is_buildtime', true)
->pluck('key');
foreach ($variables as $key => $value) {
if ($dbVariables->contains($key)) {
$userDefinedVariables->put($key, $value);
}
}
if ($userDefinedVariables->isEmpty()) {
return;
}
$variablesArray = $userDefinedVariables->toArray();
$warnings = self::analyzeBuildVariables($variablesArray);
if (empty($warnings)) {

View File

@@ -2,7 +2,7 @@
return [
'coolify' => [
'version' => '4.0.0-beta.430',
'version' => '4.0.0-beta.431',
'helper_version' => '1.0.11',
'realtime_version' => '1.0.10',
'self_hosted' => env('SELF_HOSTED', true),

12
deployCy.sh Normal file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
# Build and deploy Coolify Docker image
set -e
echo "Building Coolify Docker image..."
docker build -f docker/production/Dockerfile -t docker.site.quack-lab.dev/coolify:4.0.0 .
echo "Image built successfully. Attempting to push..."
docker push docker.site.quack-lab.dev/coolify:4.0.0
echo "Deployment completed successfully!"

View File

@@ -72,6 +72,7 @@ RUN apk add --no-cache gnupg && \
curl -fSsL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgresql.gpg
# Install system dependencies
RUN apk upgrade
RUN apk add --no-cache \
postgresql${POSTGRES_VERSION}-client \
openssh-client \

View File

@@ -1,10 +1,10 @@
{
"coolify": {
"v4": {
"version": "4.0.0-beta.430"
"version": "4.0.0-beta.431"
},
"nightly": {
"version": "4.0.0-beta.431"
"version": "4.0.0-beta.432"
},
"helper": {
"version": "1.0.11"

View File

@@ -1,10 +1,10 @@
{
"coolify": {
"v4": {
"version": "4.0.0-beta.430"
"version": "4.0.0-beta.431"
},
"nightly": {
"version": "4.0.0-beta.431"
"version": "4.0.0-beta.432"
},
"helper": {
"version": "1.0.11"