Skip to content

Commit

Permalink
Add Laravel 11 support
Browse files Browse the repository at this point in the history
  • Loading branch information
antonkomarev committed Mar 9, 2024
1 parent 5f0f4d3 commit 31c8d0e
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 203 deletions.
3 changes: 1 addition & 2 deletions .docker/php74/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# ----------------------
# The FPM base container
# ----------------------
FROM php:7.4-fpm-alpine AS dev
FROM php:7.4-cli-alpine AS dev

# Install build dependencies
RUN apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS

Expand Down
85 changes: 0 additions & 85 deletions .docker/php74/www.conf

This file was deleted.

3 changes: 1 addition & 2 deletions .docker/php82/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# ----------------------
# The FPM base container
# ----------------------
FROM php:8.2-fpm-alpine AS dev
FROM php:8.2-cli-alpine AS dev

# Install build dependencies
RUN apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS

Expand Down
85 changes: 0 additions & 85 deletions .docker/php82/www.conf

This file was deleted.

12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
},
"require": {
"php": "^7.4|^8.0",
"illuminate/console": "^8.0|^9.0|^10.1.3",
"illuminate/contracts": "^8.0|^9.0|^10.1.3",
"illuminate/filesystem": "^8.0|^9.0|^10.1.3",
"illuminate/support": "^8.0|^9.0|^10.1.3",
"illuminate/console": "^8.0|^9.0|^10.1.3|^11.0",
"illuminate/contracts": "^8.0|^9.0|^10.1.3|^11.0",
"illuminate/filesystem": "^8.0|^9.0|^10.1.3|^11.0",
"illuminate/support": "^8.0|^9.0|^10.1.3|^11.0",
"smi2/phpclickhouse": "^1.4"
},
"require-dev": {
"orchestra/testbench": "^7.0|^8.0",
"phpunit/phpunit": "^9.6|^10.0"
"orchestra/testbench": "^7.0|^8.0|^9.0",
"phpunit/phpunit": "^9.6|^10.5"
},
"autoload": {
"psr-4": {
Expand Down
29 changes: 6 additions & 23 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,26 @@
version: "3.9"

services:
php74:
container_name: laravel-clickhouse-php74
image: laravel-clickhouse-php74
container_name: laravel-clickhouse-lib-74
image: laravel-clickhouse-lib-74
build:
context: ./
dockerfile: ./.docker/php74/Dockerfile
restart: unless-stopped
depends_on:
- clickhouse
tty: true
working_dir: /app
volumes:
- ./:/app
- ./.docker/php74/www.conf:/usr/local/etc/php-fpm.d/www.conf:ro
networks:
- laravel-clickhouse

php82:
container_name: laravel-clickhouse-php82
image: laravel-clickhouse-php82
container_name: laravel-clickhouse-lib-82
image: laravel-clickhouse-lib-82
build:
context: ./
dockerfile: ./.docker/php82/Dockerfile
restart: unless-stopped
depends_on:
- clickhouse
tty: true
working_dir: /app
volumes:
- ./:/app
- ./.docker/php82/www.conf:/usr/local/etc/php-fpm.d/www.conf:ro
networks:
- laravel-clickhouse

clickhouse:
container_name: laravel-clickhouse-clickhouse
Expand All @@ -52,13 +41,7 @@ services:
ports:
- "8123:8123"
- "9000:9000"
networks:
- laravel-clickhouse

volumes:
.docker-volume-clickhouse:
driver: local

networks:
laravel-clickhouse:
driver: bridge

0 comments on commit 31c8d0e

Please sign in to comment.