Skip to content

Commit

Permalink
fix chmod error on docker servers (#355)
Browse files Browse the repository at this point in the history
  • Loading branch information
saeedvaziry authored Nov 8, 2024
1 parent 2c49e27 commit 07c51ab
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
11 changes: 11 additions & 0 deletions app/Support/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Route;
use Illuminate\Validation\ValidationException;

function generate_public_key($privateKeyPath, $publicKeyPath): void
{
Expand Down Expand Up @@ -79,6 +80,16 @@ function run_action(object $static, Closure $callback): void
])
->send();

if (method_exists($static, 'halt')) {
$reflectionMethod = new ReflectionMethod($static, 'halt');
$reflectionMethod->invoke($static);
}
} catch (ValidationException $e) {
Notification::make()
->danger()
->title($e->getMessage())
->send();

if (method_exists($static, 'halt')) {
$reflectionMethod = new ReflectionMethod($static, 'halt');
$reflectionMethod->invoke($static);
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get install -y nginx
# php
RUN apt-get update \
&& apt-get install -y cron gnupg gosu curl ca-certificates zip unzip supervisor libcap2-bin libpng-dev \
python2 dnsutils librsvg2-bin fswatch wget \
python2 dnsutils librsvg2-bin fswatch wget openssh-client \
&& add-apt-repository ppa:ondrej/php -y \
&& apt-get update \
&& apt-get install -y php8.2 php8.2-fpm php8.2-mbstring php8.2-mcrypt php8.2-gd php8.2-xml \
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/SitesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public function test_failed_to_update_source_control(): void
->callInfolistAction('source_control_id', 'edit_source_control', [
'source_control' => $sourceControl->id,
])
->assertHasActionErrors();
->assertNotified('Repository not found');
}

public function test_update_v_host(): void
Expand Down

0 comments on commit 07c51ab

Please sign in to comment.