Browse Source

+ php82 src image

master
dimti 8 months ago
parent
commit
32b98ae170
  1. 12
      src/docker-compose.yml
  2. 6
      src/dockerfiles/php-fpm/php.base.Dockerfile
  3. 7
      src/dockerfiles/php-fpm/php82.Dockerfile
  4. 6
      src/dockerfiles/workspace/workspace.base.Dockerfile
  5. 9
      src/dockerfiles/workspace/workspace82.Dockerfile

12
src/docker-compose.yml

@ -19,6 +19,12 @@ services:
service: php-fpm service: php-fpm
build: build:
dockerfile: php81.Dockerfile dockerfile: php81.Dockerfile
php82:
extends:
file: docker-compose.base.yml
service: php-fpm
build:
dockerfile: php82.Dockerfile
workspace74: workspace74:
extends: extends:
file: docker-compose.base.yml file: docker-compose.base.yml
@ -31,3 +37,9 @@ services:
service: workspace service: workspace
build: build:
dockerfile: workspace81.Dockerfile dockerfile: workspace81.Dockerfile
workspace82:
extends:
file: docker-compose.base.yml
service: workspace
build:
dockerfile: workspace82.Dockerfile

6
src/dockerfiles/php-fpm/php.base.Dockerfile

@ -21,7 +21,13 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl install xdebug-2.5.5; \ pecl install xdebug-2.5.5; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
if [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
pecl install xdebug-3.1.6; \ pecl install xdebug-3.1.6; \
elif [ $(php -r "echo PHP_MINOR_VERSION;") = "2" ]; then \
pecl install xdebug-3.3.1; \
else \
pecl install xdebug; \
fi \
else \ else \
pecl install xdebug-2.9.8; \ pecl install xdebug-2.9.8; \
fi && \ fi && \

7
src/dockerfiles/php-fpm/php82.Dockerfile

@ -0,0 +1,7 @@
# syntax = edrevo/dockerfile-plus
FROM php:8.2-fpm
INCLUDE+ ./php.base.Dockerfile
RUN docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \
&& docker-php-ext-install -j$(nproc) gd

6
src/dockerfiles/workspace/workspace.base.Dockerfile

@ -158,7 +158,13 @@ RUN if [ ${INSTALL_S3_MINIO_CLIENT} = true ]; then \
RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl install xdebug-2.5.5; \ pecl install xdebug-2.5.5; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
if [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
pecl install xdebug-3.1.6; \ pecl install xdebug-3.1.6; \
elif [ $(php -r "echo PHP_MINOR_VERSION;") = "2" ]; then \
pecl install xdebug-3.3.1; \
else \
pecl install xdebug; \
fi \
else \ else \
pecl install xdebug-2.9.8; \ pecl install xdebug-2.9.8; \
fi && \ fi && \

9
src/dockerfiles/workspace/workspace82.Dockerfile

@ -0,0 +1,9 @@
# syntax = edrevo/dockerfile-plus
FROM laradock/workspace:latest-8.2
ARG PHP_VERSION=8.2
ENV PHP_VERSION ${PHP_VERSION}
INCLUDE+ ./workspace.base.Dockerfile
INCLUDE+ ./composer.Dockerfile
INCLUDE+ ./xdebug3.Dockerfile
Loading…
Cancel
Save