Skip to content

Commit 386af73

Browse files
Laravel 11.30.0 Shift (alexjustesen#1771)
* Bump Laravel version constraint * composer update * updated composer dependencies * updated sail dockerfile * added back ping util --------- Co-authored-by: Shift <[email protected]>
1 parent b4f1054 commit 386af73

File tree

8 files changed

+448
-397
lines changed

8 files changed

+448
-397
lines changed

_ide_helper.php

Lines changed: 111 additions & 70 deletions
Large diffs are not rendered by default.

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,32 @@
1818
"awcodes/filament-versions": "^2.0.1",
1919
"chrisullyott/php-filesize": "^4.2.1",
2020
"dragonmantank/cron-expression": "^3.4.0",
21-
"filament/filament": "^3.2.117",
22-
"filament/spatie-laravel-settings-plugin": "^3.2.117",
21+
"filament/filament": "^3.2.123",
22+
"filament/spatie-laravel-settings-plugin": "^3.2.123",
2323
"geerlingguy/ping": "^1.2.1",
2424
"guzzlehttp/guzzle": "^7.9.2",
2525
"influxdata/influxdb-client-php": "^3.6",
2626
"laravel-notification-channels/telegram": "^5.0",
27-
"laravel/framework": "^11.27.2",
27+
"laravel/framework": "^11.30",
2828
"laravel/prompts": "^0.2.1",
2929
"laravel/sanctum": "^4.0.3",
3030
"laravel/tinker": "^2.10.0",
31-
"livewire/livewire": "^3.5.4",
31+
"livewire/livewire": "^3.5.12",
3232
"lorisleiva/laravel-actions": "^2.8.4",
3333
"maennchen/zipstream-php": "^2.4",
3434
"spatie/laravel-settings": "^3.4",
3535
"spatie/laravel-webhook-server": "^3.8.1",
3636
"timokoerber/laravel-one-time-operations": "^1.4.2"
3737
},
3838
"require-dev": {
39-
"barryvdh/laravel-ide-helper": "^3.1",
39+
"barryvdh/laravel-ide-helper": "^3.2.2",
4040
"fakerphp/faker": "^1.23.1",
4141
"laravel/pint": "^1.18.1",
42-
"laravel/sail": "^1.35.0",
43-
"laravel/telescope": "^5.2.2",
42+
"laravel/sail": "^1.37.1",
43+
"laravel/telescope": "^5.2.4",
4444
"mockery/mockery": "^1.6.12",
45-
"nunomaduro/collision": "^8.4.0",
46-
"phpunit/phpunit": "^11.4.1",
45+
"nunomaduro/collision": "^8.5.0",
46+
"phpunit/phpunit": "^11.4.3",
4747
"spatie/laravel-ignition": "^2.8.0",
4848
"tightenco/duster": "^3.0.3"
4949
},

composer.lock

Lines changed: 299 additions & 301 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker/8.3/Dockerfile

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ LABEL maintainer="Alex Justesen"
44

55
ARG WWWGROUP
66
ARG NODE_VERSION=20
7-
ARG POSTGRES_VERSION=15
7+
ARG MYSQL_CLIENT="mysql-client"
8+
ARG POSTGRES_VERSION=17
89

910
WORKDIR /var/www/html
1011

@@ -15,9 +16,13 @@ ENV SUPERVISOR_PHP_USER="sail"
1516

1617
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
1718

18-
RUN apt-get update \
19+
RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \
20+
echo "Acquire::http::No-Cache true;" >> /etc/apt/apt.conf.d/99custom && \
21+
echo "Acquire::BrokenProxy true;" >> /etc/apt/apt.conf.d/99custom
22+
23+
RUN apt-get update && apt-get upgrade -y \
1924
&& mkdir -p /etc/apt/keyrings \
20-
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils iputils-ping librsvg2-bin fswatch nano cron \
25+
&& apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils iputils-ping librsvg2-bin fswatch cron \
2126
&& curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /etc/apt/keyrings/ppa_ondrej_php.gpg > /dev/null \
2227
&& echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
2328
&& apt-get update \
@@ -33,14 +38,15 @@ RUN apt-get update \
3338
RUN curl -sLS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer \
3439
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
3540
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
36-
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/keyrings/pgdg.gpg >/dev/null \
37-
&& echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
38-
&& curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | bash \
3941
&& apt-get update \
4042
&& apt-get install -y nodejs \
4143
&& npm install -g npm \
42-
&& apt-get install -y mysql-client \
44+
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/keyrings/pgdg.gpg >/dev/null \
45+
&& echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
46+
&& apt-get update \
47+
&& apt-get install -y $MYSQL_CLIENT \
4348
&& apt-get install -y postgresql-client-$POSTGRES_VERSION \
49+
&& curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | bash \
4450
&& apt-get install -y speedtest \
4551
&& apt-get -y autoremove \
4652
&& apt-get clean \
@@ -57,6 +63,6 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
5763
COPY php.ini /etc/php/8.3/cli/conf.d/99-sail.ini
5864
RUN chmod +x /usr/local/bin/start-container
5965

60-
EXPOSE 8000
66+
EXPOSE 80/tcp
6167

6268
ENTRYPOINT ["start-container"]
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
3+
/usr/bin/mariadb --user=root --password="$MYSQL_ROOT_PASSWORD" <<-EOSQL
4+
CREATE DATABASE IF NOT EXISTS testing;
5+
GRANT ALL PRIVILEGES ON \`testing%\`.* TO '$MYSQL_USER'@'%';
6+
EOSQL

public/js/filament/forms/components/file-upload.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/vendor/telescope/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/app.js": "/app.js?id=48ba33a2532e4b6ec718bc0f03b3f1e4",
2+
"/app.js": "/app.js?id=99f84d421ae083196e0a45c3c310168b",
33
"/app-dark.css": "/app-dark.css?id=1ea407db56c5163ae29311f1f38eb7b9",
44
"/app.css": "/app.css?id=de4c978567bfd90b38d186937dee5ccf"
55
}

0 commit comments

Comments
 (0)