Skip to content

Commit d7a1669

Browse files
FaksFaks
authored
Merge pull request #24 from Faks/dev
Dev
2 parents b5d5259 + c6c9606 commit d7a1669

9 files changed

Lines changed: 237 additions & 156 deletions

File tree

‎.env.example‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ COMPOSE_PROJECT_NAME=laradock
3838
### PHP Version ###########################################
3939

4040
# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
41-
# Accepted values: 8.3 - 8.2 - 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
42-
PHP_VERSION=7.4
41+
# Accepted values: 8.4 - 8.3 - 8.2 - 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
42+
PHP_VERSION=8.3
4343

4444
### Phalcon Version ###########################################
4545

‎.github/workflows/main-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
php_version: [ "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" ]
25+
php_version: [ "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
2626
service: [ php-fpm, php-worker, workspace ]
2727
steps:
2828
- uses: actions/checkout@v4

‎DOCUMENTATION/docusaurus.config.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ const config: Config = {
3636
docs: {
3737
id: 'default',
3838
sidebarPath: './sidebars.ts',
39-
// Please change this to your repo.
40-
// Remove this to remove the "edit this page" links.
4139
editUrl:
42-
'https://github.com/facebook/docusaurus/tree/main/packages/create-docusaurus/templates/shared/',
40+
'https://github.com/laradock/laradock/tree/master/DOCUMENTATION/',
4341
},
4442
// blog: {
4543
// showReadingTime: true,

‎docker-compose.yml‎

Lines changed: 144 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,126 @@ services:
247247
- backend
248248
links:
249249
- docker-in-docker
250+
php-fpm-8.4:
251+
build:
252+
context: ./php-fpm
253+
args:
254+
- CHANGE_SOURCE=${CHANGE_SOURCE}
255+
- BASE_IMAGE_TAG_PREFIX=${PHP_FPM_BASE_IMAGE_TAG_PREFIX}
256+
- LARADOCK_PHP_VERSION=${PHP_VERSION}
257+
- LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
258+
- INSTALL_BZ2=${PHP_FPM_INSTALL_BZ2}
259+
- INSTALL_ENCHANT=${PHP_FPM_INSTALL_ENCHANT}
260+
- INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
261+
- INSTALL_GNUPG=${PHP_FPM_INSTALL_GNUPG}
262+
- INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
263+
- XDEBUG_PORT=${PHP_FPM_XDEBUG_PORT}
264+
- INSTALL_PCOV=${PHP_FPM_INSTALL_PCOV}
265+
- INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG}
266+
- INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
267+
- INSTALL_SSH2=${PHP_FPM_INSTALL_SSH2}
268+
- INSTALL_SOAP=${PHP_FPM_INSTALL_SOAP}
269+
- INSTALL_XSL=${PHP_FPM_INSTALL_XSL}
270+
- INSTALL_SMB=${PHP_FPM_INSTALL_SMB}
271+
- INSTALL_IMAP=${PHP_FPM_INSTALL_IMAP}
272+
- INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
273+
- INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP}
274+
- INSTALL_CASSANDRA=${PHP_FPM_INSTALL_CASSANDRA}
275+
- INSTALL_ZMQ=${PHP_FPM_INSTALL_ZMQ}
276+
- INSTALL_GEARMAN=${PHP_FPM_INSTALL_GEARMAN}
277+
- INSTALL_MSSQL=${PHP_FPM_INSTALL_MSSQL}
278+
- INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
279+
- INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS}
280+
- INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
281+
- INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
282+
- INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
283+
- INSTALL_AEROSPIKE=${PHP_FPM_INSTALL_AEROSPIKE}
284+
- INSTALL_OCI8=${PHP_FPM_INSTALL_OCI8}
285+
- INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
286+
- INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
287+
- INSTALL_PG_CLIENT=${PHP_FPM_INSTALL_PG_CLIENT}
288+
- PG_CLIENT_VERSION=${POSTGRES_CLIENT_VERSION}
289+
- INSTALL_POSTGIS=${PHP_FPM_INSTALL_POSTGIS}
290+
- INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
291+
- INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
292+
- INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}
293+
- INSTALL_PHALCON=${PHP_FPM_INSTALL_PHALCON}
294+
- INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE}
295+
- INSTALL_TAINT=${PHP_FPM_INSTALL_TAINT}
296+
- INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS}
297+
- INSTALL_IMAGEMAGICK=${PHP_FPM_INSTALL_IMAGEMAGICK}
298+
- INSTALL_CALENDAR=${PHP_FPM_INSTALL_CALENDAR}
299+
- INSTALL_XLSWRITER=${PHP_FPM_INSTALL_XLSWRITER}
300+
- INSTALL_FAKETIME=${PHP_FPM_INSTALL_FAKETIME}
301+
- INSTALL_IONCUBE=${PHP_FPM_INSTALL_IONCUBE}
302+
- INSTALL_APCU=${PHP_FPM_INSTALL_APCU}
303+
- INSTALL_CACHETOOL=${PHP_FPM_INSTALL_CACHETOOL}
304+
- INSTALL_YAML=${PHP_FPM_INSTALL_YAML}
305+
- INSTALL_RDKAFKA=${PHP_FPM_INSTALL_RDKAFKA}
306+
- INSTALL_GETTEXT=${PHP_FPM_INSTALL_GETTEXT}
307+
- INSTALL_ADDITIONAL_LOCALES=${PHP_FPM_INSTALL_ADDITIONAL_LOCALES}
308+
- INSTALL_MYSQL_CLIENT=${PHP_FPM_INSTALL_MYSQL_CLIENT}
309+
- INSTALL_PING=${PHP_FPM_INSTALL_PING}
310+
- INSTALL_SSHPASS=${PHP_FPM_INSTALL_SSHPASS}
311+
- INSTALL_MAILPARSE=${PHP_FPM_INSTALL_MAILPARSE}
312+
- INSTALL_PCNTL=${PHP_FPM_INSTALL_PCNTL}
313+
- ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES}
314+
- INSTALL_FFMPEG=${PHP_FPM_FFMPEG}
315+
- INSTALL_AUDIOWAVEFORM=${PHP_FPM_AUDIOWAVEFORM}
316+
- INSTALL_WKHTMLTOPDF=${PHP_FPM_INSTALL_WKHTMLTOPDF}
317+
- WKHTMLTOPDF_VERSION=${PHP_FPM_WKHTMLTOPDF_VERSION}
318+
- INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF}
319+
- INSTALL_XMLRPC=${PHP_FPM_INSTALL_XMLRPC}
320+
- INSTALL_PHPDECIMAL=${PHP_FPM_INSTALL_PHPDECIMAL}
321+
- INSTALL_ZOOKEEPER=${PHP_FPM_INSTALL_ZOOKEEPER}
322+
- INSTALL_SSDB=${PHP_FPM_INSTALL_SSDB}
323+
- INSTALL_TRADER=${PHP_FPM_INSTALL_TRADER}
324+
- INSTALL_EVENT=${PHP_FPM_INSTALL_EVENT}
325+
- LEGACY_OPENSSL=${PHP_LEGACY_OPENSSL}
326+
- DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=${PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL}
327+
- DOWNGRADE_OPENSSL_TLS_VERSION=${PHP_DOWNGRADE_OPENSSL_TLS_VERSION}
328+
- PUID=${PHP_FPM_PUID}
329+
- PGID=${PHP_FPM_PGID}
330+
- IMAGEMAGICK_VERSION=${PHP_FPM_IMAGEMAGICK_VERSION}
331+
- LOCALE=${PHP_FPM_DEFAULT_LOCALE}
332+
- NEW_RELIC=${PHP_FPM_NEW_RELIC}
333+
- NEW_RELIC_KEY=${PHP_FPM_NEW_RELIC_KEY}
334+
- NEW_RELIC_APP_NAME=${PHP_FPM_NEW_RELIC_APP_NAME}
335+
- INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
336+
- INSTALL_DNSUTILS=${PHP_FPM_INSTALL_DNSUTILS}
337+
- INSTALL_POPPLER_UTILS=${PHP_FPM_INSTALL_POPPLER_UTILS}
338+
- ORACLE_INSTANT_CLIENT_MIRROR=${ORACLE_INSTANT_CLIENT_MIRROR}
339+
- ORACLE_INSTANT_CLIENT_ARCH=${ORACLE_INSTANT_CLIENT_ARCH}
340+
- ORACLE_INSTANT_CLIENT_MAJOR=${ORACLE_INSTANT_CLIENT_MAJOR}
341+
- ORACLE_INSTANT_CLIENT_MINOR=${ORACLE_INSTANT_CLIENT_MINOR}
342+
- http_proxy
343+
- https_proxy
344+
- no_proxy
345+
volumes:
346+
- /etc/localtime:/etc/localtime:ro
347+
- /etc/timezone:/etc/timezone:ro
348+
- ./php-fpm/php8.4.ini:/usr/local/etc/php/php.ini
349+
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
350+
- docker-in-docker:/certs/client
351+
ports:
352+
- "8400:9000"
353+
expose:
354+
- "8400"
355+
extra_hosts:
356+
- "dockerhost:${DOCKER_HOST_IP}"
357+
environment:
358+
- DOCKER_HOST=tcp://docker-in-docker:2376
359+
- DOCKER_TLS_VERIFY=1
360+
- DOCKER_TLS_CERTDIR=/certs
361+
- DOCKER_CERT_PATH=/certs/client
362+
- FAKETIME=${PHP_FPM_FAKETIME}
363+
- TZ=${WORKSPACE_TIMEZONE}
364+
depends_on:
365+
- workspace
366+
networks:
367+
- backend
368+
links:
369+
- docker-in-docker
250370
php-fpm-8.3:
251371
build:
252372
context: ./php-fpm
@@ -626,9 +746,10 @@ services:
626746
- "${NGINX_HOST_HTTPS_PORT}:443"
627747
- "${VARNISH_BACKEND_PORT}:81"
628748
depends_on:
629-
- php-fpm
749+
- php-fpm-8.4
630750
- php-fpm-8.3
631751
- php-fpm-8.2
752+
- php-fpm
632753
- php-fpm-8.0
633754
- php-fpm-7.4
634755
- php-fpm-5.6
@@ -662,9 +783,10 @@ services:
662783
- "${OPENRESTY_HOST_HTTPS_PORT}:443"
663784
- "${VARNISH_BACKEND_PORT}:81"
664785
depends_on:
665-
- php-fpm
786+
- php-fpm-8.4
666787
- php-fpm-8.3
667788
- php-fpm-8.2
789+
- php-fpm
668790
- php-fpm-8.0
669791
- php-fpm-7.4
670792
- php-fpm-5.6
@@ -682,9 +804,10 @@ services:
682804
- BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID}
683805
- BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN}
684806
depends_on:
685-
- php-fpm
807+
- php-fpm-8.4
686808
- php-fpm-8.3
687809
- php-fpm-8.2
810+
- php-fpm
688811
- php-fpm-8.0
689812
- php-fpm-7.4
690813
- php-fpm-5.6
@@ -714,9 +837,10 @@ services:
714837
- "${APACHE_HOST_HTTP_PORT}:80"
715838
- "${APACHE_HOST_HTTPS_PORT}:443"
716839
depends_on:
717-
- php-fpm
840+
- php-fpm-8.4
718841
- php-fpm-8.3
719842
- php-fpm-8.2
843+
- php-fpm
720844
- php-fpm-8.0
721845
- php-fpm-7.4
722846
- php-fpm-5.6
@@ -1149,9 +1273,10 @@ services:
11491273
ports:
11501274
- "${MEMCACHED_HOST_PORT}:11211"
11511275
depends_on:
1152-
- php-fpm
1276+
- php-fpm-8.4
11531277
- php-fpm-8.3
11541278
- php-fpm-8.2
1279+
- php-fpm
11551280
- php-fpm-8.0
11561281
- php-fpm-7.4
11571282
- php-fpm-5.6
@@ -1169,9 +1294,10 @@ services:
11691294
- "${BEANSTALKD_HOST_PORT}:11300"
11701295
privileged: true
11711296
depends_on:
1172-
- php-fpm
1297+
- php-fpm-8.4
11731298
- php-fpm-8.3
11741299
- php-fpm-8.2
1300+
- php-fpm
11751301
- php-fpm-8.0
11761302
- php-fpm-7.4
11771303
- php-fpm-5.6
@@ -1213,9 +1339,10 @@ services:
12131339
- ./rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
12141340
- ./rabbitmq/management_agent.disable_metrics_collector.conf:/etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
12151341
depends_on:
1216-
- php-fpm
1342+
- php-fpm-8.4
12171343
- php-fpm-8.3
12181344
- php-fpm-8.2
1345+
- php-fpm
12191346
- php-fpm-8.0
12201347
- php-fpm-7.4
12211348
- php-fpm-5.6
@@ -1275,9 +1402,10 @@ services:
12751402
- /etc/timezone:/etc/timezone:ro
12761403
- ${DATA_PATH_HOST}/cassandra:/var/lib/cassandra
12771404
depends_on:
1278-
- php-fpm
1405+
- php-fpm-8.4
12791406
- php-fpm-8.3
12801407
- php-fpm-8.2
1408+
- php-fpm
12811409
- php-fpm-8.0
12821410
- php-fpm-7.4
12831411
- php-fpm-5.6
@@ -1317,9 +1445,10 @@ services:
13171445
- GEARMAN_MYSQL_TABLE=${GEARMAN_MYSQL_TABLE}
13181446
hostname: laradock-gearman
13191447
depends_on:
1320-
- php-fpm
1448+
- php-fpm-8.4
13211449
- php-fpm-8.3
13221450
- php-fpm-8.2
1451+
- php-fpm
13231452
- php-fpm-8.0
13241453
- php-fpm-7.4
13251454
- php-fpm-5.6
@@ -1355,9 +1484,10 @@ services:
13551484
- "${CADDY_HOST_HTTP_PORT}:80"
13561485
- "${CADDY_HOST_HTTPS_PORT}:443"
13571486
depends_on:
1358-
- php-fpm
1487+
- php-fpm-8.4
13591488
- php-fpm-8.3
13601489
- php-fpm-8.2
1490+
- php-fpm
13611491
- php-fpm-8.0
13621492
- php-fpm-7.4
13631493
- php-fpm-5.6
@@ -1405,9 +1535,10 @@ services:
14051535
ports:
14061536
- "${ADM_PORT}:8080"
14071537
depends_on:
1408-
- php-fpm
1538+
- php-fpm-8.4
14091539
- php-fpm-8.3
14101540
- php-fpm-8.2
1541+
- php-fpm
14111542
- php-fpm-8.0
14121543
- php-fpm-7.4
14131544
- php-fpm-5.6
@@ -1480,9 +1611,10 @@ services:
14801611
- "${ELASTICSEARCH_HOST_HTTP_PORT}:9200"
14811612
- "${ELASTICSEARCH_HOST_TRANSPORT_PORT}:9300"
14821613
depends_on:
1483-
- php-fpm
1614+
- php-fpm-8.4
14841615
- php-fpm-8.3
14851616
- php-fpm-8.2
1617+
- php-fpm
14861618
- php-fpm-8.0
14871619
- php-fpm-7.4
14881620
- php-fpm-5.6

‎laravel-horizon/Dockerfile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,11 @@ RUN set -eux; \
108108
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
109109
cd /tmp && \
110110
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
111-
git clone https://github.com/Imagick/imagick; \
111+
if [ ${LARADOCK_PHP_VERSION} = "8.4" ]; then \
112+
git clone --branch develop https://github.com/Imagick/imagick; \
113+
else \
114+
git clone https://github.com/Imagick/imagick; \
115+
fi; \
112116
else \
113117
git clone --branch ${IMAGEMAGICK_VERSION} https://github.com/Imagick/imagick; \
114118
fi && \

0 commit comments

Comments
 (0)