Skip to content

Commit

Permalink
Merge pull request #2014 from coollabsio/next
Browse files Browse the repository at this point in the history
v4.0.0-beta.262
  • Loading branch information
andrasbacsai authored Apr 17, 2024
2 parents aa79acd + 01b3aab commit 08d9dff
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 12 deletions.
4 changes: 3 additions & 1 deletion app/Jobs/ApplicationDeploymentJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -1239,8 +1239,10 @@ private function generate_compose_file()
if ($this->pull_request_id !== 0) {
$labels = collect(generateLabelsApplication($this->application, $this->preview));
}
$labels = $labels->map(function ($value, $key) {
return escapeDollarSign($value);
});
$labels = $labels->merge(defaultLabels($this->application->id, $this->application->uuid, $this->pull_request_id))->toArray();

// Check for custom HEALTHCHECK
$this->custom_healthcheck_found = false;
if ($this->application->build_pack === 'dockerfile' || $this->application->dockerfile) {
Expand Down
2 changes: 1 addition & 1 deletion config/sentry.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

// The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.261',
'release' => '4.0.0-beta.262',
// When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'),

Expand Down
2 changes: 1 addition & 1 deletion config/version.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

return '4.0.0-beta.261';
return '4.0.0-beta.262';
2 changes: 1 addition & 1 deletion templates/compose/appsmith.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# documentation: https://appsmith.com
# slogan: Appsmith is low-code application platform for building internal tools.
# slogan: A low-code application platform for building internal tools.
# tags: lowcode,nocode,no,low,platform
# logo: svgs/appsmith.svg

Expand Down
2 changes: 1 addition & 1 deletion templates/compose/appwrite.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# documentation: https://appwrite.io
# slogan: Appwrite is backend-as-a-service platform that simplifies the web & mobile app development.
# slogan: A backend-as-a-service platform that simplifies the web & mobile app development.
# env_file: appwrite.env
# tags: backend-as-a-service, platform
# logo: svgs/appwrite.svg
Expand Down
2 changes: 1 addition & 1 deletion templates/compose/babybuddy.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# documentation: https://docs.baby-buddy.net
# slogan: Baby Buddy helps parents track their baby's daily activities, growth, and health with ease.
# slogan: It helps parents track their baby's daily activities, growth, and health with ease.
# tags: baby, parents, health, growth, activities
# logo: svgs/babybuddy.png

Expand Down
2 changes: 1 addition & 1 deletion templates/compose/budge.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# documentation: https://github.com/linuxserver/budge
# slogan: Budge is a budgeting personal finance app.
# slogan: A budgeting personal finance app.
# tags: personal finance, budgeting, expense tracking

services:
Expand Down
8 changes: 4 additions & 4 deletions templates/service-templates.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion versions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"coolify": {
"v4": {
"version": "4.0.0-beta.261"
"version": "4.0.0-beta.262"
}
}
}
Expand Down

0 comments on commit 08d9dff

Please sign in to comment.