Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/sail
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.26.3
Choose a base ref
...
head repository: laravel/sail
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.27.0
Choose a head ref
  • 3 commits
  • 10 files changed
  • 3 contributors

Commits on Dec 5, 2023

  1. Update CHANGELOG

    @driesvints @github-actions
    driesvints authored and github-actions[bot] committed Dec 5, 2023
    Copy the full SHA
    15ec4be View commit details

Commits on Dec 29, 2023

  1. [1.x] Allow easy customization of the command ran by supervisor's PHP… 

    … process (#645)

* Add PHP_COMMAND environment variable to Dockerfile

* Add environment variable substitution in supervisord.conf

* Fix variable name
    @bram-pkg
    bram-pkg authored Dec 29, 2023
    Copy the full SHA
    9fa62a7 View commit details

Commits on Jan 3, 2024

  1. Default to PHP 8.3 (#647)

    @Jubeki
    Jubeki authored Jan 3, 2024
    Copy the full SHA
    65a7764 View commit details
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Release Notes

## [Unreleased](https://github.com/laravel/sail/compare/v1.26.2...1.x)
## [Unreleased](https://github.com/laravel/sail/compare/v1.26.3...1.x)

## [v1.26.3](https://github.com/laravel/sail/compare/v1.26.2...v1.26.3) - 2023-12-02

* [1.x] Add PHP 8.3 xdebug by [@Jubeki](https://github.com/Jubeki) in https://github.com/laravel/sail/pull/642

## [v1.26.2](https://github.com/laravel/sail/compare/v1.26.1...v1.26.2) - 2023-11-27

1 change: 1 addition & 0 deletions runtimes/8.0/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ WORKDIR /var/www/html

ENV DEBIAN_FRONTEND noninteractive
ENV TZ=UTC
ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80"

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

2 changes: 1 addition & 1 deletion runtimes/8.0/supervisord.conf
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ logfile=/var/log/supervisor/supervisord.log
pidfile=/var/run/supervisord.pid

[program:php]
command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80
command=%(ENV_SUPERVISOR_PHP_COMMAND)s
user=sail
environment=LARAVEL_SAIL="1"
stdout_logfile=/dev/stdout
1 change: 1 addition & 0 deletions runtimes/8.1/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ WORKDIR /var/www/html

ENV DEBIAN_FRONTEND noninteractive
ENV TZ=UTC
ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80"

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

2 changes: 1 addition & 1 deletion runtimes/8.1/supervisord.conf
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ logfile=/var/log/supervisor/supervisord.log
pidfile=/var/run/supervisord.pid

[program:php]
command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80
command=%(ENV_SUPERVISOR_PHP_COMMAND)s
user=sail
environment=LARAVEL_SAIL="1"
stdout_logfile=/dev/stdout
1 change: 1 addition & 0 deletions runtimes/8.2/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ WORKDIR /var/www/html

ENV DEBIAN_FRONTEND noninteractive
ENV TZ=UTC
ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80"

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

2 changes: 1 addition & 1 deletion runtimes/8.2/supervisord.conf
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ logfile=/var/log/supervisor/supervisord.log
pidfile=/var/run/supervisord.pid

[program:php]
command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80
command=%(ENV_SUPERVISOR_PHP_COMMAND)s
user=sail
environment=LARAVEL_SAIL="1"
stdout_logfile=/dev/stdout
1 change: 1 addition & 0 deletions runtimes/8.3/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ WORKDIR /var/www/html

ENV DEBIAN_FRONTEND noninteractive
ENV TZ=UTC
ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80"

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

2 changes: 1 addition & 1 deletion runtimes/8.3/supervisord.conf
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ logfile=/var/log/supervisor/supervisord.log
pidfile=/var/run/supervisord.pid

[program:php]
command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80
command=%(ENV_SUPERVISOR_PHP_COMMAND)s
user=sail
environment=LARAVEL_SAIL="1"
stdout_logfile=/dev/stdout
4 changes: 2 additions & 2 deletions stubs/docker-compose.stub
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@
services:
laravel.test:
build:
context: ./vendor/laravel/sail/runtimes/8.2
context: ./vendor/laravel/sail/runtimes/8.3
dockerfile: Dockerfile
args:
WWWGROUP: '${WWWGROUP}'
image: sail-8.2/app
image: sail-8.3/app
extra_hosts:
- 'host.docker.internal:host-gateway'
ports: