From e4ca5ee5f5bf0cf94a8f732c841b881b1211ca44 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 19 Jul 2024 14:34:19 +0200 Subject: [PATCH 1/5] chore: Update Traefik image version to v2.11 --- bootstrap/helpers/proxy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php index 44352ea55..23c9a2333 100644 --- a/bootstrap/helpers/proxy.php +++ b/bootstrap/helpers/proxy.php @@ -132,7 +132,7 @@ function generate_default_proxy_configuration(Server $server) 'services' => [ 'traefik' => [ 'container_name' => 'coolify-proxy', - 'image' => 'traefik:v2.10', + 'image' => 'traefik:v2.11', 'restart' => RESTART_MODE, 'extra_hosts' => [ 'host.docker.internal:host-gateway', From 6feb439d0a2d4dca6b7d03a7487cf9072070a36a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 19 Jul 2024 14:34:21 +0200 Subject: [PATCH 2/5] chore: Update version to 4.0.0-beta.317 --- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index f65c89760..ac9a59666 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -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.316', + 'release' => '4.0.0-beta.317', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 8821278c1..79801a5ea 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Fri, 19 Jul 2024 14:38:47 +0200 Subject: [PATCH 3/5] revert: advanced dropdown --- .../project/application/general.blade.php | 206 ++++++++---------- 1 file changed, 90 insertions(+), 116 deletions(-) diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php index 232900a5d..389c9b000 100644 --- a/resources/views/livewire/project/application/general.blade.php +++ b/resources/views/livewire/project/application/general.blade.php @@ -149,124 +149,99 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry" Specific Docs @endif + @endif -
-
- -
-
- @if ($application->build_pack === 'dockercompose') -
-
- - -
-
- -
-
The following commands are for advanced use cases. Only - modify them if you - know what are - you doing.
-
- - -
-
- @else -
- - @if ($application->build_pack === 'dockerfile' && !$application->dockerfile) - - @endif - - @if ($application->build_pack === 'dockerfile') - - @endif - @if ($application->could_set_build_commands()) - @if ($application->settings->is_static) - - @else - - @endif - @endif - -
- @if ($this->application->is_github_based() && !$this->application->is_public_repository()) -
- -
- @endif - - - @if ($application->build_pack !== 'dockercompose') -
- -
- @endif - @if ($application->could_set_build_commands()) -
- -
- @endif - @endif +
+ @if ($application->build_pack === 'dockercompose') +
+
+ + +
+
+ +
+
The following commands are for advanced use cases. + Only + modify them if you + know what are + you doing.
+
+ +
-
+ @else +
+ + @if ($application->build_pack === 'dockerfile' && !$application->dockerfile) + + @endif + + @if ($application->build_pack === 'dockerfile') + + @endif + @if ($application->could_set_build_commands()) + @if ($application->settings->is_static) + + @else + + @endif + @endif + +
+ @if ($this->application->is_github_based() && !$this->application->is_public_repository()) +
+ +
+ @endif + + + @if ($application->build_pack !== 'dockercompose') +
+ +
+ @endif + @if ($application->could_set_build_commands()) +
+ +
+ @endif + @endif
@endif
@@ -292,7 +267,6 @@ class="flex items-center justify-between w-full p-1 text-left select-none hover: id="application.settings.is_container_label_readonly_enabled" instantSave>
@endif - @if ($application->dockerfile) From 14dc93321999a538d96632e478f4d4f71ad83a70 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 19 Jul 2024 14:40:01 +0200 Subject: [PATCH 4/5] fix: missing input for api endpoint --- app/Http/Controllers/Api/ApplicationsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/ApplicationsController.php b/app/Http/Controllers/Api/ApplicationsController.php index bb8c44050..e9280a8ad 100644 --- a/app/Http/Controllers/Api/ApplicationsController.php +++ b/app/Http/Controllers/Api/ApplicationsController.php @@ -620,7 +620,7 @@ public function create_dockercompose_application(Request $request) private function create_application(Request $request, $type) { - $allowedFields = ['project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'type', 'name', 'description', 'is_static', 'domains', 'git_repository', 'git_branch', 'git_commit_sha', 'docker_registry_image_name', 'docker_registry_image_tag', 'build_pack', 'install_command', 'build_command', 'start_command', 'ports_exposes', 'ports_mappings', 'base_directory', 'publish_directory', 'health_check_enabled', 'health_check_path', 'health_check_port', 'health_check_host', 'health_check_method', 'health_check_return_code', 'health_check_scheme', 'health_check_response_text', 'health_check_interval', 'health_check_timeout', 'health_check_retries', 'health_check_start_period', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'custom_labels', 'custom_docker_run_options', 'post_deployment_command', 'post_deployment_command_container', 'pre_deployment_command', 'pre_deployment_command_container', 'manual_webhook_secret_github', 'manual_webhook_secret_gitlab', 'manual_webhook_secret_bitbucket', 'manual_webhook_secret_gitea', 'redirect', 'github_app_uuid', 'instant_deploy', 'dockerfile', 'docker_compose_location', 'docker_compose_raw', 'docker_compose_custom_start_command', 'docker_compose_custom_build_command', 'docker_compose_domains', 'watch_paths']; + $allowedFields = ['project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'type', 'name', 'description', 'is_static', 'domains', 'git_repository', 'git_branch', 'git_commit_sha', 'private_key_uuid', 'docker_registry_image_name', 'docker_registry_image_tag', 'build_pack', 'install_command', 'build_command', 'start_command', 'ports_exposes', 'ports_mappings', 'base_directory', 'publish_directory', 'health_check_enabled', 'health_check_path', 'health_check_port', 'health_check_host', 'health_check_method', 'health_check_return_code', 'health_check_scheme', 'health_check_response_text', 'health_check_interval', 'health_check_timeout', 'health_check_retries', 'health_check_start_period', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'custom_labels', 'custom_docker_run_options', 'post_deployment_command', 'post_deployment_command_container', 'pre_deployment_command', 'pre_deployment_command_container', 'manual_webhook_secret_github', 'manual_webhook_secret_gitlab', 'manual_webhook_secret_bitbucket', 'manual_webhook_secret_gitea', 'redirect', 'github_app_uuid', 'instant_deploy', 'dockerfile', 'docker_compose_location', 'docker_compose_raw', 'docker_compose_custom_start_command', 'docker_compose_custom_build_command', 'docker_compose_domains', 'watch_paths']; $teamId = getTeamIdFromToken(); if (is_null($teamId)) { return invalidTokenResponse(); From 0e99f978550e314dc3da2c79072991b1a07676cd Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 19 Jul 2024 14:56:18 +0200 Subject: [PATCH 5/5] oops --- app/Jobs/ApplicationDeploymentJob.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 3024bf393..65f8f3423 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -299,13 +299,13 @@ public function handle(): void } else { $this->write_deployment_configurations(); } - // $this->execute_remote_command( - // [ - // "docker rm -f {$this->deployment_uuid} >/dev/null 2>&1", - // 'hidden' => true, - // 'ignore_errors' => true, - // ] - // ); + $this->execute_remote_command( + [ + "docker rm -f {$this->deployment_uuid} >/dev/null 2>&1", + 'hidden' => true, + 'ignore_errors' => true, + ] + ); // $this->execute_remote_command( // [