Skip to content

Commit

Permalink
[Docker] update php tag to 8.3 (#11267)
Browse files Browse the repository at this point in the history
  • Loading branch information
ottaviano authored Jan 6, 2025
1 parent c98c176 commit 6e82084
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 10 deletions.
5 changes: 4 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
**/docker-compose.*.yml
**/docker-compose.yaml
**/docker-compose.yml
**/compose.*.yaml
**/compose.*.yml
**/compose.yaml
**/compose.yml
**/Dockerfile
**/Thumbs.db
.github/
Expand All @@ -32,7 +36,6 @@ vendor/
.idea
.tmp
app/
docker-dev.md5
.php_cs.*
features
Makefile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
DOCKER_BUILDKIT: 1
DOCKER_COMPOSE_ARGS: -f docker-compose.yml -f docker-compose.ci.yml
DOCKER_COMPOSE_ARGS: -f compose.yml -f compose.ci.yml
EXEC_ARGS: -T
# Update this to force cache reset
CACHE_KEY: ${{ secrets.CACHE_KEY }}
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,15 @@
/public/built/
/public/select2/
/.tmp
/docker-compose.override.yml
/compose.override.yml
/gcloud-service-key.json
/npm-debug.log
/phpunit.xml
/.phpunit.result.cache
/yarn-error.log
/.php_cs
/.docker-dev.md5
/behat.yml
/docker-dev.lock
docker-dev.md5
node_modules
.idea
/.env.local
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ARG CADDY_VERSION=2
# Fix the version of PHP to avoid this bug https://github.com/php/php-src/issues/14480
ARG PHP_VERSION=8.3.7
ARG PHP_VERSION=8.3
ARG NODE_VERSION=18

FROM node:${NODE_VERSION}-alpine AS node
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion docker/php/conf.d/app.dev.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
; The `client_host` below may optionally be replaced with `discover_client_host=yes`
; Add `start_with_request=yes` to start debug session on each request
xdebug.client_host = 'host.docker.internal'
opcache.enable = Off
opcache.enable = 0
6 changes: 3 additions & 3 deletions docker/php/conf.d/default.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
memory_limit = -1
short_open_tag = Off
expose_php = Off
short_open_tag = 0
expose_php = 0
date.timezone = Europe/Paris
apc.enable_cli = On
apc.enable_cli = 1
session.use_strict_mode = 1
zend.detect_unicode = 0
intl.default_locale = fr
Expand Down

0 comments on commit 6e82084

Please sign in to comment.