Skip to content

Commit 694a1a1

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents b96394c + de21ab5 commit 694a1a1

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

‎Dockerfile‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,22 @@ RUN apk add --no-cache \
8181
sqlite-dev \
8282
oniguruma-dev \
8383
postgresql-dev \
84+
autoconf \
85+
g++ \
86+
make \
8487
&& docker-php-ext-install \
8588
pdo \
8689
pdo_sqlite \
8790
pdo_mysql \
91+
pdo_pgsql \
8892
mbstring \
8993
pcntl \
9094
bcmath \
9195
zip \
92-
opcache
96+
opcache \
97+
&& pecl install --onlyreqdeps --force redis \
98+
&& rm -rf /tmp/pear \
99+
&& docker-php-ext-enable redis
93100

94101
# Install Composer
95102
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
@@ -149,4 +156,3 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=40s --retries=3 \
149156

150157
# Start Laravel development server (for production, use nginx + PHP-FPM)
151158
CMD ["php", "artisan", "serve", "--host=0.0.0.0", "--port=8000"]
152-

‎app/Domains/Repository/Http/Controllers/RepositoryController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function destroy(Request $request, Organization $organization, Repository
121121
abort(404);
122122
}
123123

124-
if ($request->user()->cannot('deleteRepository', $organization)) {
124+
if (! $request->user()?->can('deleteRepository', $organization)) {
125125
abort(403);
126126
}
127127

0 commit comments

Comments
 (0)