Skip to content

Commit 7ab7b3b

Browse files
committed
Updated laravel packages and docker files
1 parent c9939a8 commit 7ab7b3b

File tree

11 files changed

+45
-8100
lines changed

11 files changed

+45
-8100
lines changed

docker-compose.local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ services:
219219
context: ./mysql
220220
dockerfile: Dockerfile
221221
args:
222-
MYSQL_VERSION: ${MYSQL_VERSION:-8}
222+
MYSQL_VERSION: ${MYSQL_VERSION:-8.0.39-30}
223223
APP_ENV: "${APP_ENV:-local}"
224224
TZ: "${APP_TIMEZONE:-Europe/London}"
225225
LANG: "${LANG:-en_GB}"

docker-compose.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ services:
2828
XDEBUG_MODE: 'off'
2929
XDEBUG_CONFIG: 'client_host=host.docker.internal'
3030
volumes:
31+
- /etc/timezone:/etc/timezone:ro
32+
- /etc/default/locale:/etc/default/locale:ro
33+
- /etc/locale.gen:/etc/locale.gen:ro
3134
- ./laravel:/var/www
3235
- ./php/php-ini-overrides.ini:/usr/local/etc/php/php.ini
3336
networks:
@@ -64,6 +67,10 @@ services:
6467
CORS_CREDENTIALS: "true"
6568
TZ: "${APP_TIMEZONE:-Europe/London}"
6669
LANG: "${APP_ENCODE:-en_GB}"
70+
volumes:
71+
- /etc/timezone:/etc/timezone:ro
72+
- /etc/default/locale:/etc/default/locale:ro
73+
- /etc/locale.gen:/etc/locale.gen:ro
6774
networks:
6875
- DOCKER_BRIDGE
6976
depends_on:

laravel/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Homestead.yaml
1414
auth.json
1515
npm-debug.log
1616
yarn-error.log
17+
composer.lock
1718
/.fleet
1819
/.idea
1920
/.vscode

laravel/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Base image
44
FROM php:fpm
55

6-
MAINTAINER John J <john@xoren.io>
6+
LABEL maintainer="John J <john@xoren.io>"
77

88
# Build arguments.
99
ARG APP_ENV=${APP_ENV:-local}
@@ -21,7 +21,7 @@ ARG LANG=en_GB
2121
ARG LCFILE=/etc/default/locale
2222
ARG LGFILE=/etc/locale.gen
2323

24-
ARG NODE_VERSION=${NODE_VERSION:-20}
24+
ARG NODE_VERSION=${NODE_VERSION:-22}
2525
ARG SWOOLE_PORT=${SWOOLE_PORT:-8000}
2626

2727
# Environment variables.
@@ -74,9 +74,9 @@ RUN echo "$TZ" > /etc/timezone && \
7474
RUN dpkg-reconfigure --frontend noninteractive tzdata && locale-gen "${LANG}.UTF-8 .UTF-8" && update-locale
7575

7676
# Install PHP extensions.
77-
RUN docker-php-ext-install pdo_mysql ctype exif pcntl bcmath && \
77+
RUN docker-php-ext-install pdo_mysql gd ctype exif pcntl bcmath && \
7878
pecl install redis zip csv swoole && \
79-
docker-php-ext-enable redis zip csv swoole
79+
docker-php-ext-enable redis zip gd csv swoole
8080

8181
# Install Composer
8282
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

laravel/composer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
"keywords": ["laravel", "framework"],
66
"license": "MIT",
77
"require": {
8-
"php": "^8.1",
9-
"guzzlehttp/guzzle": "^7.2",
10-
"laravel/framework": "^10.10",
11-
"laravel/octane": "^2.0",
12-
"laravel/sanctum": "^3.2",
13-
"laravel/tinker": "^2.8",
14-
"pusher/pusher-php-server": "^7.2"
8+
"php": "^8.2",
9+
"guzzlehttp/guzzle": "^7.9.2",
10+
"laravel/framework": "^11.0",
11+
"laravel/octane": "^2.6.0",
12+
"laravel/sanctum": "^4.0",
13+
"laravel/tinker": "^2.10",
14+
"pusher/pusher-php-server": "^7.2.7"
1515
},
1616
"require-dev": {
17-
"fakerphp/faker": "^1.9.1",
18-
"laravel/pint": "^1.0",
19-
"mockery/mockery": "^1.4.4",
20-
"nunomaduro/collision": "^7.0",
21-
"phpunit/phpunit": "^10.1"
17+
"fakerphp/faker": "^1.24.1",
18+
"laravel/pint": "^1.20.0",
19+
"mockery/mockery": "^1.6.12",
20+
"nunomaduro/collision": "^8.5.0",
21+
"phpunit/phpunit": "^11.5"
2222
},
2323
"autoload": {
2424
"psr-4": {

0 commit comments

Comments
 (0)