Compare commits

...

79 Commits
v14.0 ... v16.0

Author SHA1 Message Date
Shao Yu-Lung (Allen)
6deb3c07c0 Merge pull request #3467 from AliEbrahimpour/master
add   restart: always for all service
2024-07-29 16:20:58 +08:00
AliEbrahimpour
c976b16ddd Update docker-compose.yml 2024-07-28 12:42:55 +03:30
AliEbrahimpour
5aed205358 Update Dockerfile
add timezone for php-worker
2024-07-28 12:40:39 +03:30
AliEbrahimpour
55cbf29aa3 Merge branch 'laradock:master' into master 2024-07-28 12:38:44 +03:30
Shao Yu-Lung (Allen)
03622a6312 Merge pull request #3540 from laradock/quick-fix-mysql
fix: mysql service exit
2024-07-24 17:12:12 +08:00
Shao Yu-Lung (Allen)
a549510dd0 fix: mysql service exit 2024-07-24 17:06:35 +08:00
Shao Yu-Lung (Allen)
16ec1c4a2c Merge pull request #3533 from erikn69/patch-28
Fix oracle instant client args from env
2024-07-22 23:03:26 +08:00
Shao Yu-Lung (Allen)
49bfbd91a0 Merge pull request #3534 from erikn69/patch-29
Fix swoole
2024-07-19 21:24:34 +08:00
erikn69
cd1b3834cc Fix Swoole 2 2024-07-17 08:50:55 -05:00
Shao Yu-Lung (Allen)
0c8cef2a99 Merge pull request #3528 from erikn69/patch-26
Workspace: add new aliases
2024-07-17 18:19:13 +08:00
Shao Yu-Lung (Allen)
c2b7f0df2b Merge pull request #3537 from joe380/master
Fix for bug #3535
2024-07-17 18:12:06 +08:00
Shao Yu-Lung (Allen)
b6989ac632 Merge pull request #3531 from laradock/dependabot/npm_and_yarn/react/braces-3.0.3
build(deps): bump braces from 3.0.2 to 3.0.3 in /react
2024-07-17 18:08:05 +08:00
Shao Yu-Lung (Allen)
2f0d75e35b Merge pull request #3519 from laradock/dependabot/npm_and_yarn/react/ejs-3.1.10
build(deps): bump ejs from 3.1.8 to 3.1.10 in /react
2024-07-17 18:07:47 +08:00
Shao Yu-Lung (Allen)
a511ad3ec0 Merge pull request #3516 from laradock/dependabot/npm_and_yarn/react/tar-6.2.1
build(deps): bump tar from 6.1.15 to 6.2.1 in /react
2024-07-17 18:07:29 +08:00
Ján Peti
c3280bd68b Merge pull request #1 from joe380/joe380-patch-issue-3535
Fix for bug #3535
2024-07-09 15:19:24 +02:00
Ján Peti
c586a5bf8a Fix for bug #3535 2024-07-07 11:19:44 +02:00
AliEbrahimpour
abbf2ee45d Update docker-compose.yml 2024-07-01 18:51:24 +03:30
AliEbrahimpour
9ef9f4a4b8 Update docker-compose.yml
add time zone for phpf-pm
2024-07-01 17:53:24 +03:30
AliEbrahimpour
1343d0e9ec Merge branch 'laradock:master' into master 2024-07-01 17:51:37 +03:30
erikn69
308358fd0e Fix swoole 2024-06-27 09:13:51 -05:00
erikn69
7a6e547910 Fix oracle instant client args from env 2024-06-27 08:48:28 -05:00
dependabot[bot]
1e043361ab build(deps): bump braces from 3.0.2 to 3.0.3 in /react
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-18 04:52:41 +00:00
erikn69
8633d48ff1 Workspace: add new aliases 2024-06-05 12:52:11 -05:00
Shao Yu-Lung (Allen)
5051303027 Merge pull request #3521 from erikn69/patch-25
Fix `mysql_native_password` on MySQL 8.4.0 (2024-04-30, LTS Release)
2024-05-25 13:59:27 +08:00
erikn69
0b18a45163 fix mysql_native_password 2024-05-22 13:27:24 -05:00
dependabot[bot]
2393f16384 build(deps): bump ejs from 3.1.8 to 3.1.10 in /react
Bumps [ejs](https://github.com/mde/ejs) from 3.1.8 to 3.1.10.
- [Release notes](https://github.com/mde/ejs/releases)
- [Commits](https://github.com/mde/ejs/compare/v3.1.8...v3.1.10)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-02 05:08:59 +00:00
Shao Yu-Lung (Allen)
0d213effcc Merge pull request #3517 from amorZhu/master
Handle Phalcon installation exceptions in php-worker
2024-04-26 22:05:19 +08:00
zhushaolong
2d08b4fcf0 Update docker-compose.yml 2024-04-25 18:13:25 +08:00
zhushaolong
df4ef54889 Update php-worker Dockerfile 2024-04-25 18:12:23 +08:00
Shao Yu-Lung (Allen)
4b79f94511 Merge pull request #3498 from erikn69/patch-23
Customizable Soketi Server Version
2024-04-19 12:57:51 +08:00
Shao Yu-Lung (Allen)
0d25eae2a1 Merge pull request #3481 from erikn69/patch-19
Fix IONCUBE on Php 8.2
2024-04-19 12:39:39 +08:00
Shao Yu-Lung (Allen)
38a2672b69 Merge pull request #3488 from da-mask/main
Adding Github CLI to workspace
2024-04-19 12:36:59 +08:00
dependabot[bot]
993691bfbb build(deps): bump tar from 6.1.15 to 6.2.1 in /react
Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.15 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.1.15...v6.2.1)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-19 04:04:29 +00:00
Shao Yu-Lung (Allen)
1775f9f144 Merge pull request #3511 from laradock/dependabot/npm_and_yarn/react/express-4.19.2
build(deps): bump express from 4.18.2 to 4.19.2 in /react
2024-04-19 12:02:49 +08:00
Shao Yu-Lung (Allen)
6437958016 Merge pull request #3509 from laradock/dependabot/npm_and_yarn/react/webpack-dev-middleware-5.3.4
build(deps): bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /react
2024-04-19 12:02:35 +08:00
Shao Yu-Lung (Allen)
93b6aef93f Merge pull request #3507 from laradock/dependabot/npm_and_yarn/react/follow-redirects-1.15.6
build(deps): bump follow-redirects from 1.14.8 to 1.15.6 in /react
2024-04-19 12:02:14 +08:00
Shao Yu-Lung (Allen)
0d3821f26d Merge pull request #3505 from laradock/dependabot/npm_and_yarn/react/ip-2.0.1
build(deps): bump ip from 2.0.0 to 2.0.1 in /react
2024-04-19 12:01:54 +08:00
dependabot[bot]
d798f33741 build(deps): bump express from 4.18.2 to 4.19.2 in /react
Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-28 17:08:09 +00:00
dependabot[bot]
f6bc0e3911 build(deps): bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /react
Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4)

---
updated-dependencies:
- dependency-name: webpack-dev-middleware
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-23 11:31:28 +00:00
dependabot[bot]
d07e5fff3d build(deps): bump follow-redirects from 1.14.8 to 1.15.6 in /react
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.8 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.8...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-15 12:58:35 +00:00
Shao Yu-Lung (Allen)
5816497525 Merge pull request #3499 from erikn69/patch-24
Fix MSSQL on PHP 8.0
2024-02-23 00:28:41 +08:00
dependabot[bot]
0f3affb744 build(deps): bump ip from 2.0.0 to 2.0.1 in /react
Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1.
- [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-20 22:03:05 +00:00
erikn69
be5b1cc8d4 Fix MSSQL on PHP 8.0 2024-02-02 15:48:46 -05:00
erikn69
29c2b34e84 Customizable Soketi Server Version 2024-01-24 15:19:00 -05:00
Shao Yu-Lung (Allen)
3efd4ebd23 Merge pull request #3490 from erikn69/patch-21
Fix NEW RELIC on Php 8.3
2024-01-22 16:35:32 +08:00
erikn69
5b23400285 Fix NEW RELIC on Php 8.3 2023-12-22 11:52:33 -05:00
DanielFloris
2004928350 updated documentation 2023-12-15 11:45:06 +11:00
DanielFloris
b194d9a426 gh cli is installing on workspace 2023-12-15 11:17:33 +11:00
Shao Yu-Lung (Allen)
06cc77a156 Merge pull request #3471 from erikn69/patch-14
added, PHP_LEGACY_OPENSSL (Fix for OpenSSL 3)
2023-12-12 08:41:34 +08:00
Shao Yu-Lung (Allen)
9e5e05a11d Merge pull request #3474 from buihanh2304/update-workspace.add-composer-2.2-support
Add composer self-update 2.2 support
2023-12-12 08:40:53 +08:00
Shao Yu-Lung (Allen)
70a083685b Merge pull request #3475 from laradock/dependabot/npm_and_yarn/react/axios-1.6.0
build(deps): bump axios from 0.21.2 to 1.6.0 in /react
2023-12-12 08:40:12 +08:00
Shao Yu-Lung (Allen)
7a6e7b6dcc Merge pull request #3486 from erikn69/patch-20
Don't install New Relic on PHP 8.3
2023-12-12 08:39:39 +08:00
erikn69
e81d1d294c Don't install New Relic on PHP 8.3 2023-12-04 10:08:59 -05:00
Shao Yu-Lung (Allen)
63f06428ae Merge pull request #3485 from erikn69/patch-16
feat: Support PHP 8.3
2023-12-03 22:19:37 +08:00
Shao Yu-Lung (Allen)
cfe0a4a209 Merge pull request #3480 from erikn69/patch-18
Fix no longer maintained Drupal Console
2023-12-03 01:21:37 +08:00
Shao Yu-Lung (Allen)
edf408bda5 Merge pull request #3478 from erikn69/patch-17
Fix mongodb
2023-12-03 01:20:30 +08:00
erikn69
5d638d3907 Bump xdebug to 3.3.0, Support PHP 8.3 2023-11-30 12:48:52 -05:00
erikn69
eee8891b6b Fix IONCUBE on Php 8.2 2023-11-27 17:08:29 -05:00
erikn69
53cc1a8785 Fix no longer maintained Drupal Console 2023-11-27 16:02:15 -05:00
erikn69
397e45cf4d feat: Support PHP 8.3 2023-11-27 12:31:07 -05:00
erikn69
0349947ba1 Fix mongodb 2023-11-23 10:54:42 -05:00
dependabot[bot]
308890df39 build(deps): bump axios from 0.21.2 to 1.6.0 in /react
Bumps [axios](https://github.com/axios/axios) from 0.21.2 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.2...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-10 16:06:56 +00:00
HanhBT
de954ca652 Add composer self-update 2.2 support 2023-11-10 14:48:49 +07:00
erikn69
5e6bf80dde add legacy support for OpenSSL ^3 2023-11-06 17:25:24 -05:00
Shao Yu-Lung (Allen)
b75d8ba0bd Merge pull request #3472 from erikn69/patch-15
fix NEW_RELIC args typo
2023-10-31 21:21:19 +08:00
erikn69
e977a74915 upgrade new relic version and link 2023-10-30 16:16:58 -05:00
erikn69
7a73104118 fix NEW_RELIC args typo 2023-10-30 15:40:03 -05:00
Dawid Makowski
ed4772bd73 Merge pull request #3468 from laradock/dependabot/npm_and_yarn/react/babel/traverse-7.23.2
build(deps): bump @babel/traverse from 7.20.5 to 7.23.2 in /react
2023-10-29 17:47:02 +07:00
Shao Yu-Lung (Allen)
b958fc096c Merge pull request #3421 from abordage/fix-jdk
Fix build arguments for JDK
2023-10-19 15:12:00 +08:00
Shao Yu-Lung (Allen)
a41b32289f Merge pull request #3466 from oneCentral/master
v18 packages should be used instead of v17 for sqlsrv (mssql) support in workspace and php-fpm
2023-10-19 15:07:56 +08:00
dependabot[bot]
5bc3a08b35 build(deps): bump @babel/traverse from 7.20.5 to 7.23.2 in /react
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.20.5 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-18 19:55:42 +00:00
AliEbrahimpour
ca038770c2 add restart: always for all service 2023-10-18 15:11:22 +03:30
oneCentral
fb28345184 sqlsrv mssql packages update 2023-10-18 10:01:24 +02:00
oneCentral
8b1c7c949d sqlsrv mssql packages update 2023-10-18 10:00:23 +02:00
Shao Yu-Lung (Allen)
3fc731152b Merge pull request #3465 from laradock/remove-adminer-depends
chore: adminer remove unnecessary service depends
2023-10-18 08:27:36 +08:00
Shao Yu-Lung (Allen)
13ed9edaaa chore: adminer remove unnecessary service depends 2023-10-18 08:20:20 +08:00
Shao Yu-Lung (Allen)
9073aa23f6 Merge pull request #3464 from laradock/fix-3447
fix: mysql service down after startup
2023-10-18 08:13:20 +08:00
Shao Yu-Lung (Allen)
923cded79a fix: mysql service down after startup 2023-10-18 08:11:05 +08:00
Pavel Bychko
031dd97d44 Fix build arguments 2023-07-24 20:55:04 +03:00
15 changed files with 2417 additions and 203 deletions

View File

@@ -38,8 +38,8 @@ COMPOSE_PROJECT_NAME=laradock
### PHP Version ###########################################
# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
# Accepted values: 8.2 - 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
PHP_VERSION=7.4
# Accepted values: 8.3 - 8.2 - 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
PHP_VERSION=8.3
### Phalcon Version ###########################################
@@ -61,6 +61,11 @@ DOCKER_HOST_IP=10.0.75.1
# Choose a Remote Interpreter entry matching name. Default is `laradock`
PHP_IDE_CONFIG=serverName=laradock
### PHP USE LEGACY OPENSSL ################################
# Since OpenSSL 3 some ciphers are not available
PHP_LEGACY_OPENSSL=false
### PHP DOWNGRADEOPENSSL TLS AND SECLEVEL #################
PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=false
@@ -218,6 +223,7 @@ WORKSPACE_INSTALL_DNSUTILS=true
WORKSPACE_XDEBUG_PORT=9000
WORKSPACE_VITE_PORT=5173
WORKSPACE_INSTALL_JDK=true
WORKSPACE_INSTALL_GITHUB_CLI=false
### PHP_FPM ###############################################
@@ -401,7 +407,8 @@ APACHE_FOR_MAC_M1=false
### MYSQL #################################################
MYSQL_VERSION=latest
# 5.7, 8.0, 8.4, 9.0
MYSQL_VERSION=8.4
MYSQL_DATABASE=default
MYSQL_USER=default
MYSQL_PASSWORD=secret
@@ -1067,6 +1074,8 @@ NATS_MONITORING_PORT=6222
NATS_ROUTE_PORT=8222
### SOKETI ##################################################
SOKETI_NODE_VERSION=16-debian
SOKETI_BASE_IMAGE_TAG_PREFIX=latest
SOKETI_PORT=6001
SOKETI_METRICS_SERVER_PORT=9601

View File

@@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php_version: [ "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2" ]
php_version: [ "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" ]
service: [ php-fpm, php-worker, workspace ]
steps:
- uses: actions/checkout@v4

View File

@@ -382,6 +382,41 @@ WORKSPACE_INSTALL_PHPDBG=true
PHP_FPM_INSTALL_PHPDBG=true
```
<br>
<a name="Install-github-copilot-cli"></a>
## Install Github Copilot Cli
### Note: You must have Github Copilot access to use this feature.
Install `gh-cli` in the Workspace Container:
<br>
1 - Open the `.env`.
2 - Search for `WORKSPACE_INSTALL_GITHUB_CLI`.
3 - Set value to `true`
```dotenv
WORKSPACE_INSTALL_GITHUB_CLI=true
```
4 - Re-build the containers `docker compose build workspace`
5 - start your container `docker compose up -d workspace // ..and all your other containers`
6 - Enter the Workspace container:
```bash
docker-compose exec workspace bash
```
7 - Authenticate with your github account and follow the instructions::
```bash
gh auth login
```
8 - Install the copilot cli:
```bash
gh extension install github/gh-copilot
```

View File

@@ -57,6 +57,7 @@ services:
### Workspace Utilities ##################################
workspace:
restart: always
build:
context: ./workspace
args:
@@ -178,6 +179,12 @@ services:
- INSTALL_EVENT=${WORKSPACE_INSTALL_EVENT}
- INSTALL_DNSUTILS=${WORKSPACE_INSTALL_DNSUTILS}
- INSTALL_POPPLER_UTILS=${WORKSPACE_INSTALL_POPPLER_UTILS}
- INSTALL_JDK=${WORKSPACE_INSTALL_JDK}
- INSTALL_GITHUB_CLI=${WORKSPACE_INSTALL_GITHUB_CLI}
- ORACLE_INSTANT_CLIENT_MIRROR=${ORACLE_INSTANT_CLIENT_MIRROR}
- ORACLE_INSTANT_CLIENT_ARCH=${ORACLE_INSTANT_CLIENT_ARCH}
- ORACLE_INSTANT_CLIENT_MAJOR=${ORACLE_INSTANT_CLIENT_MAJOR}
- ORACLE_INSTANT_CLIENT_MINOR=${ORACLE_INSTANT_CLIENT_MINOR}
- http_proxy
- https_proxy
- no_proxy
@@ -211,6 +218,7 @@ services:
### PHP-FPM ##############################################
php-fpm:
restart: always
build:
context: ./php-fpm
args:
@@ -285,19 +293,23 @@ services:
- INSTALL_SSDB=${PHP_FPM_INSTALL_SSDB}
- INSTALL_TRADER=${PHP_FPM_INSTALL_TRADER}
- INSTALL_EVENT=${PHP_FPM_INSTALL_EVENT}
- LEGACY_OPENSSL=${PHP_LEGACY_OPENSSL}
- DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=${PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL}
- DOWNGRADE_OPENSSL_TLS_VERSION=${PHP_DOWNGRADE_OPENSSL_TLS_VERSION}
- PUID=${PHP_FPM_PUID}
- PGID=${PHP_FPM_PGID}
- IMAGEMAGICK_VERSION=${PHP_FPM_IMAGEMAGICK_VERSION}
- LOCALE=${PHP_FPM_DEFAULT_LOCALE}
- PHP_FPM_NEW_RELIC=${PHP_FPM_NEW_RELIC}
- PHP_FPM_NEW_RELIC_KEY=${PHP_FPM_NEW_RELIC_KEY}
- PHP_FPM_NEW_RELIC_APP_NAME=${PHP_FPM_NEW_RELIC_APP_NAME}
- NEW_RELIC=${PHP_FPM_NEW_RELIC}
- NEW_RELIC_KEY=${PHP_FPM_NEW_RELIC_KEY}
- NEW_RELIC_APP_NAME=${PHP_FPM_NEW_RELIC_APP_NAME}
- INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
- INSTALL_DNSUTILS=${PHP_FPM_INSTALL_DNSUTILS}
- INSTALL_POPPLER_UTILS=${PHP_FPM_INSTALL_POPPLER_UTILS}
- INSTALL_JDK=${WORKSPACE_INSTALL_JDK}
- ORACLE_INSTANT_CLIENT_MIRROR=${ORACLE_INSTANT_CLIENT_MIRROR}
- ORACLE_INSTANT_CLIENT_ARCH=${ORACLE_INSTANT_CLIENT_ARCH}
- ORACLE_INSTANT_CLIENT_MAJOR=${ORACLE_INSTANT_CLIENT_MAJOR}
- ORACLE_INSTANT_CLIENT_MINOR=${ORACLE_INSTANT_CLIENT_MINOR}
- http_proxy
- https_proxy
- no_proxy
@@ -316,6 +328,8 @@ services:
- DOCKER_TLS_CERTDIR=/certs
- DOCKER_CERT_PATH=/certs/client
- FAKETIME=${PHP_FPM_FAKETIME}
- TZ=${WORKSPACE_TIMEZONE}
depends_on:
- workspace
networks:
@@ -325,12 +339,14 @@ services:
### PHP Worker ############################################
php-worker:
restart: always
build:
context: ./php-worker
args:
- CHANGE_SOURCE=${CHANGE_SOURCE}
- LARADOCK_PHP_VERSION=${PHP_VERSION}
- PHALCON_VERSION=${PHALCON_VERSION}
- LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
- INSTALL_BZ2=${PHP_WORKER_INSTALL_BZ2}
- INSTALL_GD=${PHP_WORKER_INSTALL_GD}
- INSTALL_IMAGEMAGICK=${PHP_WORKER_INSTALL_IMAGEMAGICK}
@@ -367,17 +383,24 @@ services:
- PUID=${PHP_WORKER_PUID}
- PGID=${PHP_WORKER_PGID}
- IMAGEMAGICK_VERSION=${PHP_WORKER_IMAGEMAGICK_VERSION}
- ORACLE_INSTANT_CLIENT_MIRROR=${ORACLE_INSTANT_CLIENT_MIRROR}
- ORACLE_INSTANT_CLIENT_ARCH=${ORACLE_INSTANT_CLIENT_ARCH}
- ORACLE_INSTANT_CLIENT_MAJOR=${ORACLE_INSTANT_CLIENT_MAJOR}
- ORACLE_INSTANT_CLIENT_MINOR=${ORACLE_INSTANT_CLIENT_MINOR}
volumes:
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
- ./php-worker/supervisord.d:/etc/supervisord.d
depends_on:
- workspace
environment:
- TZ=${WORKSPACE_TIMEZONE}
extra_hosts:
- "dockerhost:${DOCKER_HOST_IP}"
networks:
- backend
### Laravel Horizon ############################################
laravel-horizon:
restart: always
build:
context: ./laravel-horizon
args:
@@ -418,6 +441,9 @@ services:
soketi:
build:
context: ./soketi
args:
- NODE_VERSION=${SOKETI_NODE_VERSION}
- BASE_IMAGE_TAG_PREFIX=${SOKETI_BASE_IMAGE_TAG_PREFIX}
volumes:
- ./soketi/config.json:/app/bin/config.json:ro
ports:
@@ -429,6 +455,7 @@ services:
### NGINX Server #########################################
nginx:
restart: always
build:
context: ./nginx
args:
@@ -457,6 +484,7 @@ services:
### OpenResty Server #########################################
openresty:
restart: always
build:
context: ./openresty
args:
@@ -494,6 +522,7 @@ services:
### Apache Server ########################################
apache2:
restart: always
build:
context: ./apache2
args:
@@ -519,6 +548,7 @@ services:
### HHVM #################################################
hhvm:
restart: always
build: ./hhvm
volumes:
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
@@ -532,6 +562,7 @@ services:
### Minio ################################################
minio:
restart: always
build: ./minio
volumes:
- ${DATA_PATH_HOST}/minio/data:/export
@@ -548,6 +579,7 @@ services:
### MySQL ################################################
mysql:
restart: always
build:
context: ./mysql
args:
@@ -568,6 +600,7 @@ services:
### Percona ################################################
percona:
restart: always
build:
context: ./percona
environment:
@@ -585,6 +618,7 @@ services:
### MSSQL ################################################
mssql:
restart: always
build:
context: ./mssql
environment:
@@ -601,6 +635,7 @@ services:
### MariaDB ##############################################
mariadb:
restart: always
build:
context: ./mariadb
args:
@@ -624,6 +659,7 @@ services:
### PostgreSQL ###########################################
postgres:
restart: always
build:
context: ./postgres
args:
@@ -678,6 +714,7 @@ services:
### PostgreSQL PostGis ###################################
postgres-postgis:
restart: always
build:
context: ./postgres-postgis
args:
@@ -696,6 +733,7 @@ services:
### Neo4j ################################################
neo4j:
restart: always
ports:
- '7401:7474'
- '7402:7687'
@@ -719,6 +757,7 @@ services:
### MongoDB ##############################################
mongo:
restart: always
build: ./mongo
ports:
- "${MONGODB_PORT}:27017"
@@ -733,6 +772,7 @@ services:
### RethinkDB ##############################################
rethinkdb:
restart: always
build: ./rethinkdb
ports:
- "${RETHINKDB_PORT}:8080"
@@ -774,6 +814,7 @@ services:
### Redis ################################################
redis:
restart: always
build: ./redis
volumes:
- ${DATA_PATH_HOST}/redis:/data
@@ -785,6 +826,7 @@ services:
### Redis Cluster ##########################################
redis-cluster:
restart: always
build: ./redis-cluster
ports:
- "${REDIS_CLUSTER_PORT_RANGE}:7000-7005"
@@ -792,6 +834,7 @@ services:
- backend
### SSDB ################################################
ssdb:
restart: always
build: ./ssdb
volumes:
- ${DATA_PATH_HOST}/ssdb:/data
@@ -802,6 +845,7 @@ services:
### ZooKeeper #########################################
zookeeper:
restart: always
build: ./zookeeper
volumes:
- ${DATA_PATH_HOST}/zookeeper/data:/data
@@ -813,6 +857,7 @@ services:
### Aerospike ##########################################
aerospike:
restart: always
build: ./aerospike
volumes:
- workspace
@@ -831,6 +876,7 @@ services:
### Memcached ############################################
memcached:
restart: always
build: ./memcached
volumes:
- ${DATA_PATH_HOST}/memcached:/var/lib/memcached
@@ -843,6 +889,7 @@ services:
### Beanstalkd ###########################################
beanstalkd:
restart: always
build: ./beanstalkd
ports:
- "${BEANSTALKD_HOST_PORT}:11300"
@@ -854,6 +901,7 @@ services:
### SQS #############################################
sqs:
restart: always
build: ./sqs
ports:
- "${SQS_NODE_HOST_PORT}:9324"
@@ -868,6 +916,7 @@ services:
### RabbitMQ #############################################
rabbitmq:
restart: always
build: ./rabbitmq
ports:
- "${RABBITMQ_NODE_HOST_PORT}:5672"
@@ -887,6 +936,7 @@ services:
### Mercure #############################################
mercure:
restart: always
build: ./mercure
ports:
- "${MERCURE_NODE_HOST_HTTP_PORT}:80"
@@ -905,6 +955,7 @@ services:
### Cassandra ############################################
cassandra:
restart: always
build: ./cassandra
ports:
- "${CASSANDRA_TRANSPORT_PORT_NUMBER}:7000"
@@ -937,6 +988,7 @@ services:
### Gearman ############################################
gearman:
restart: always
build: ./gearman
ports:
- "${GEARMAN_PORT}:4730"
@@ -970,6 +1022,7 @@ services:
### Beanstalkd Console ###################################
beanstalkd-console:
restart: always
build: ./beanstalkd-console
ports:
- "${BEANSTALKD_CONSOLE_HOST_PORT}:2080"
@@ -980,6 +1033,7 @@ services:
### Caddy Server #########################################
caddy:
restart: always
build: ./caddy
volumes:
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
@@ -997,6 +1051,7 @@ services:
### phpMyAdmin ###########################################
phpmyadmin:
restart: always
build: ./phpmyadmin
environment:
- PMA_ARBITRARY=1
@@ -1016,6 +1071,7 @@ services:
### Adminer ###########################################
adminer:
restart: always
build:
context: ./adminer
args:
@@ -1026,14 +1082,15 @@ services:
- ADMINER_DEFAULT_SERVER=${ADM_DEFAULT_SERVER}
ports:
- "${ADM_PORT}:8080"
depends_on:
- php-fpm
# depends_on:
# - php-fpm
networks:
- frontend
- backend
### pgAdmin ##############################################
pgadmin:
restart: always
image: dpage/pgadmin4:latest
environment:
- "PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL}"
@@ -1063,6 +1120,7 @@ services:
### ElasticSearch ########################################
elasticsearch:
restart: always
build:
context: ./elasticsearch
args:
@@ -1096,6 +1154,7 @@ services:
### Logstash ##############################################
logstash:
restart: always
build:
context: ./logstash
args:
@@ -1117,6 +1176,7 @@ services:
### Kibana ##############################################
kibana:
restart: always
build:
context: ./kibana
args:
@@ -1131,6 +1191,7 @@ services:
### Dejavu ##############################################
dejavu:
restart: always
build:
context: ./dejavu
ports:
@@ -1156,6 +1217,7 @@ services:
### MailCatcher ################################################
mailcatcher:
restart: always
build: ./mailcatcher
ports:
- "1025:1025"
@@ -1166,6 +1228,7 @@ services:
### Mailhog ################################################
mailhog:
restart: always
build: ./mailhog
ports:
- "1025:1025"
@@ -1176,6 +1239,7 @@ services:
### MailDev ##############################################
maildev:
restart: always
build: ./maildev
ports:
- "${MAILDEV_HTTP_PORT}:80"
@@ -1186,6 +1250,7 @@ services:
### Mailpit ##############################################
mailpit:
restart: always
build: ./mailpit
ports:
- "${MAILPIT_HTTP_PORT}:8025"
@@ -1196,6 +1261,7 @@ services:
### Selenium ###############################################
selenium:
restart: always
build: ./selenium
ports:
- "${SELENIUM_PORT}:4444"
@@ -1206,6 +1272,7 @@ services:
### Varnish ##########################################
proxy:
restart: always
container_name: proxy
build: ./varnish
expose:
@@ -1247,6 +1314,7 @@ services:
### HAProxy ####################################
haproxy:
restart: always
build: ./haproxy
ports:
- "${HAPROXY_HOST_HTTP_PORT}:8085"
@@ -1258,6 +1326,7 @@ services:
### Jenkins ###################################################
jenkins:
restart: always
build: ./jenkins
environment:
JAVA_OPTS: "-Djava.awt.headless=true"
@@ -1274,6 +1343,7 @@ services:
### Grafana ################################################
grafana:
restart: always
build:
context: ./grafana
volumes:
@@ -1285,6 +1355,7 @@ services:
### Graylog #######################################
graylog:
restart: always
build: ./graylog
environment:
- GRAYLOG_PASSWORD_SECRET=${GRAYLOG_PASSWORD}
@@ -1315,6 +1386,7 @@ services:
### Laravel Echo Server #######################################
laravel-echo-server:
restart: always
build:
context: ./laravel-echo-server
args:
@@ -1331,6 +1403,7 @@ services:
### Solr ################################################
solr:
restart: always
build:
context: ./solr
args:
@@ -1346,6 +1419,7 @@ services:
### Thumbor #########################################
thumbor:
restart: always
build: ./thumbor
volumes:
- ${DATA_PATH_HOST}/thumbor/data:/data
@@ -1462,6 +1536,7 @@ services:
### AWS EB-CLI ################################################
aws:
restart: always
build:
context: ./aws-eb-cli
volumes:
@@ -1472,6 +1547,7 @@ services:
### Portainer ################################################
portainer:
restart: always
build:
context: ./portainer
volumes:
@@ -1533,6 +1609,7 @@ services:
### JupyterHub #########################################
jupyterhub:
restart: always
build:
context: ./jupyterhub
depends_on:
@@ -1568,6 +1645,7 @@ services:
### IPython #########################################
ipython-controller:
restart: always
build:
context: ./ipython
dockerfile: Dockerfile.controller
@@ -1588,6 +1666,7 @@ services:
### Docker-in-Docker ################################################
docker-in-docker:
restart: always
image: docker:20.10-dind
environment:
DOCKER_TLS_SAN: DNS:docker-in-docker
@@ -1602,6 +1681,7 @@ services:
### NetData ################################################
netdata:
restart: always
image: netdata/netdata:latest
cap_add:
- SYS_PTRACE
@@ -1616,6 +1696,7 @@ services:
### REDISWEBUI ################################################
redis-webui:
restart: always
build:
context: ./redis-webui
environment:
@@ -1633,6 +1714,7 @@ services:
### MongoWebUI ################################################
mongo-webui:
restart: always
build:
context: ./mongo-webui
environment:
@@ -1650,6 +1732,7 @@ services:
### Metabase #################################################
metabase:
restart: always
image: metabase/metabase:latest
environment:
- MB_DB_FILE=/metabase-data/${METABASE_DB_FILE}

View File

@@ -42,8 +42,8 @@ RUN apk --update add wget \
RUN pecl channel-update pecl.php.net; \
docker-php-ext-install mysqli mbstring pdo pdo_mysql xml pcntl; \
if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80100" ] || \
[ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80200" ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && \
[ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") != "80000" ]; then \
php -m | grep -oiE '^tokenizer$'; \
else \
docker-php-ext-install tokenizer; \

View File

@@ -1,8 +1,6 @@
ARG MYSQL_VERSION
FROM mysql:${MYSQL_VERSION}
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
#####################################
# Set Timezone
#####################################
@@ -15,6 +13,6 @@ COPY my.cnf /etc/mysql/conf.d/my.cnf
RUN chmod 0444 /etc/mysql/conf.d/my.cnf
CMD ["mysqld"]
EXPOSE 3306
RUN if [ ${MYSQL_MAJOR} = '8.0' ]; then \
echo 'default-authentication-plugin=mysql_native_password' >> /etc/mysql/conf.d/my.cnf; \
fi

View File

@@ -8,9 +8,4 @@
[mysqld]
sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
character-set-server=utf8
default-authentication-plugin=mysql_native_password
innodb_use_native_aio=0
[client]
user=root
password="root"

View File

@@ -220,7 +220,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# https://xdebug.org/docs/compat
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install xdebug-3.2.1; \
pecl install xdebug-3.3.0; \
else \
pecl install xdebug-3.1.6; \
fi; \
@@ -366,8 +366,12 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
docker-php-ext-enable mongo; \
php -m | grep -oiE '^mongo$'; \
else \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ] ;}; then \
pecl install mongodb-1.9.2; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "4" ]; then \
if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
pecl install mongodb-1.9.2; \
else \
pecl install mongodb-1.16.2; \
fi; \
else \
pecl install mongodb; \
fi; \
@@ -663,13 +667,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
ARG INSTALL_IONCUBE=false
RUN if [ ${INSTALL_IONCUBE} = true ]; then \
if [ ${LARADOCK_PHP_VERSION} = "8.1" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.4" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.3" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.2" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.1" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.0" ] \
|| [ ${LARADOCK_PHP_VERSION} = "5.6" ]; then \
if [ ${LARADOCK_PHP_VERSION} != "8.3" ] \
&& [ ${LARADOCK_PHP_VERSION} != "8.0" ]; then \
# Install the php ioncube loader
curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
&& tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \
@@ -765,14 +764,14 @@ RUN set -eux; \
# Add Microsoft repo for Microsoft ODBC Driver 13 for Linux \
apt-get update \
&& apt-get install -yqq apt-transport-https gnupg lsb-release \
&& if [ ${LARADOCK_PHP_VERSION} = "8.1" ] || [ ${LARADOCK_PHP_VERSION} = "8.2" ]; then \
&& if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && [ ${LARADOCK_PHP_VERSION} != "8.0" ]; then \
curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg \
;else \
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
;fi \
&& curl https://packages.microsoft.com/config/debian/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list \
&& apt-get update -yqq \
&& ACCEPT_EULA=Y apt-get install -yqq unixodbc unixodbc-dev libgss3 odbcinst msodbcsql17 locales \
&& ACCEPT_EULA=Y apt-get install -yqq unixodbc unixodbc-dev libgss3 odbcinst msodbcsql18 locales \
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
&& ln -sfn /etc/locale.alias /usr/share/locale/locale.alias \
&& locale-gen \
@@ -786,6 +785,8 @@ RUN set -eux; \
pecl install pdo_sqlsrv-5.9.0 sqlsrv-5.9.0 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70400" ]; then \
pecl install pdo_sqlsrv-5.10.1 sqlsrv-5.10.1 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ]; then \
pecl install pdo_sqlsrv-5.11.1 sqlsrv-5.11.1 \
;else \
pecl install pdo_sqlsrv sqlsrv \
;fi \
@@ -1175,8 +1176,8 @@ RUN if [ ${INSTALL_PHPDECIMAL} = true ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
echo 'decimal not support PHP 5.6'; \
else \
if [ ${LARADOCK_PHP_VERSION} = "8.1" ] || \
[ ${LARADOCK_PHP_VERSION} = "8.2" ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && \
[ ${LARADOCK_PHP_VERSION} != "8.0" ]; then \
curl -L -o /tmp/mpdecimal.tar.gz "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.1.tar.gz"; \
mkdir -p /tmp/mpdecimal; \
tar -C /tmp/mpdecimal -zxvf /tmp/mpdecimal.tar.gz --strip 1; \
@@ -1223,8 +1224,8 @@ ARG NEW_RELIC=${NEW_RELIC}
ARG NEW_RELIC_KEY=${NEW_RELIC_KEY}
ARG NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME}
RUN if [ ${NEW_RELIC} = true ]; then \
curl -L http://download.newrelic.com/php_agent/release/newrelic-php5-9.18.1.303-linux.tar.gz | tar -C /tmp -zx && \
RUN if [ ${NEW_RELIC} = true ] ]; then \
curl -L http://download.newrelic.com/php_agent/archive/10.15.0.4/newrelic-php5-10.15.0.4-linux.tar.gz | tar -C /tmp -zx && \
export NR_INSTALL_USE_CP_NOT_LN=1 && \
export NR_INSTALL_SILENT=1 && \
/tmp/newrelic-php5-*/newrelic-install install && \
@@ -1263,6 +1264,20 @@ RUN set -xe; \
&& rm /tmp/ssdb-client-php.tar.gz \
&& docker-php-ext-enable ssdb \
;fi
###########################################################################
# Legacy Openssl Config:
###########################################################################
ARG LEGACY_OPENSSL=false
RUN if [ ${LEGACY_OPENSSL} = true ]; then \
if openssl version | grep -q "OpenSSL 3"; then \
sed -i 's/# providers = provider_sect/providers = provider_sect/g' /etc/ssl/openssl.cnf && \
sed -i '$a[provider_sect]\ndefault=default_sect\nlegacy=legacy_sect\n' /etc/ssl/openssl.cnf && \
sed -i '$a[default_sect]\nactivate=1\n[legacy_sect]\nactivate=1\n' /etc/ssl/openssl.cnf \
;fi \
;fi
###########################################################################
# Downgrade Openssl:
###########################################################################

1959
php-fpm/php8.3.ini Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -43,8 +43,8 @@ RUN apk --update add wget \
RUN pecl channel-update pecl.php.net; \
docker-php-ext-install mysqli mbstring pdo pdo_mysql xml pcntl; \
if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80100" ] || \
[ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80200" ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && \
[ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") != "80000" ]; then \
php -m | grep -oiE '^tokenizer$'; \
else \
docker-php-ext-install tokenizer; \
@@ -164,8 +164,12 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
docker-php-ext-enable mongo; \
php -m | grep -oiE '^mongo$'; \
else \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ] ;}; then \
pecl install mongodb-1.9.2; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "4" ]; then \
if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
pecl install mongodb-1.9.2; \
else \
pecl install mongodb-1.16.2; \
fi; \
else \
pecl install mongodb; \
fi; \
@@ -344,11 +348,11 @@ ARG INSTALL_PHALCON=false
ARG LARADOCK_PHALCON_VERSION
ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
RUN if [ $INSTALL_PHALCON = true ]; then \
apt-get update -yqq \
RUN if [ "$INSTALL_PHALCON" = true ]; then \
apk update \
&& pecl channel-update pecl.php.net \
&& apt-get install -yqq libpcre3-dev; \
pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
&& apk add --no-cache libpcre32 \
&& pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
docker-php-ext-enable phalcon; \
php -m | grep -q 'phalcon' \
;fi
@@ -535,6 +539,8 @@ RUN set -eux; \
pecl install pdo_sqlsrv-5.9.0 sqlsrv-5.9.0 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70400" ]; then \
pecl install pdo_sqlsrv-5.10.1 sqlsrv-5.10.1 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ]; then \
pecl install pdo_sqlsrv-5.11.1 sqlsrv-5.11.1 \
;else \
pecl install pdo_sqlsrv sqlsrv \
;fi \
@@ -644,6 +650,17 @@ ENTRYPOINT ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisord.conf"]
#--------------------------------------------------------------------------
#
###########################################################################
# Set Timezone
###########################################################################
ARG TZ=UTC
ENV TZ ${TZ}
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
###########################################################################
RUN php -v | head -n 1 | grep -q "PHP ${PHP_VERSION}."
#

362
react/package-lock.json generated
View File

@@ -1316,44 +1316,126 @@
}
},
"@babel/traverse": {
"version": "7.20.5",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz",
"integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==",
"version": "7.23.2",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
"integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
"requires": {
"@babel/code-frame": "^7.18.6",
"@babel/generator": "^7.20.5",
"@babel/helper-environment-visitor": "^7.18.9",
"@babel/helper-function-name": "^7.19.0",
"@babel/helper-hoist-variables": "^7.18.6",
"@babel/helper-split-export-declaration": "^7.18.6",
"@babel/parser": "^7.20.5",
"@babel/types": "^7.20.5",
"@babel/code-frame": "^7.22.13",
"@babel/generator": "^7.23.0",
"@babel/helper-environment-visitor": "^7.22.20",
"@babel/helper-function-name": "^7.23.0",
"@babel/helper-hoist-variables": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.6",
"@babel/parser": "^7.23.0",
"@babel/types": "^7.23.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
"dependencies": {
"@babel/code-frame": {
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
"integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
"version": "7.22.13",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
"integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
"requires": {
"@babel/highlight": "^7.18.6"
"@babel/highlight": "^7.22.13",
"chalk": "^2.4.2"
}
},
"@babel/generator": {
"version": "7.23.0",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
"integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
"requires": {
"@babel/types": "^7.23.0",
"@jridgewell/gen-mapping": "^0.3.2",
"@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
}
},
"@babel/helper-environment-visitor": {
"version": "7.22.20",
"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
"integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
},
"@babel/helper-function-name": {
"version": "7.23.0",
"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
"integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
"requires": {
"@babel/template": "^7.22.15",
"@babel/types": "^7.23.0"
}
},
"@babel/helper-hoist-variables": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
"integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
"requires": {
"@babel/types": "^7.22.5"
}
},
"@babel/helper-split-export-declaration": {
"version": "7.22.6",
"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
"integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
"requires": {
"@babel/types": "^7.22.5"
}
},
"@babel/helper-string-parser": {
"version": "7.22.5",
"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
"integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
},
"@babel/helper-validator-identifier": {
"version": "7.19.1",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
"integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
"version": "7.22.20",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
"integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
},
"@babel/highlight": {
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
"integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
"version": "7.22.20",
"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
"integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
"requires": {
"@babel/helper-validator-identifier": "^7.18.6",
"chalk": "^2.0.0",
"@babel/helper-validator-identifier": "^7.22.20",
"chalk": "^2.4.2",
"js-tokens": "^4.0.0"
}
},
"@babel/parser": {
"version": "7.23.0",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
"integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
},
"@babel/template": {
"version": "7.22.15",
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
"integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
"requires": {
"@babel/code-frame": "^7.22.13",
"@babel/parser": "^7.22.15",
"@babel/types": "^7.22.15"
}
},
"@babel/types": {
"version": "7.23.0",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
"integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
"requires": {
"@babel/helper-string-parser": "^7.22.5",
"@babel/helper-validator-identifier": "^7.22.20",
"to-fast-properties": "^2.0.0"
}
},
"@jridgewell/gen-mapping": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
"integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
"requires": {
"@jridgewell/set-array": "^1.0.1",
"@jridgewell/sourcemap-codec": "^1.4.10",
"@jridgewell/trace-mapping": "^0.3.9"
}
}
}
},
@@ -4319,11 +4401,13 @@
"integrity": "sha512-u2MVsXfew5HBvjsczCv+xlwdNnB1oQR9HlAcsejZttNjKKSkeDNVwB1vMThIUIFI9GoT57Vtk8iQLwqOfAkboA=="
},
"axios": {
"version": "0.21.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz",
"integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==",
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
"integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
"requires": {
"follow-redirects": "^1.14.0"
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
},
"axobject-query": {
@@ -4626,53 +4710,6 @@
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
},
"body-parser": {
"version": "1.20.1",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
"requires": {
"bytes": "3.1.2",
"content-type": "~1.0.4",
"debug": "2.6.9",
"depd": "2.0.0",
"destroy": "1.2.0",
"http-errors": "2.0.0",
"iconv-lite": "0.4.24",
"on-finished": "2.4.1",
"qs": "6.11.0",
"raw-body": "2.5.1",
"type-is": "~1.6.18",
"unpipe": "1.0.0"
},
"dependencies": {
"bytes": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
},
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"requires": {
"ms": "2.0.0"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
"qs": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"requires": {
"side-channel": "^1.0.4"
}
}
}
},
"bonjour-service": {
"version": "1.0.14",
"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
@@ -4704,11 +4741,21 @@
}
},
"braces": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
"requires": {
"fill-range": "^7.0.1"
"fill-range": "^7.1.1"
},
"dependencies": {
"fill-range": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
"requires": {
"to-regex-range": "^5.0.1"
}
}
}
},
"browser-process-hrtime": {
@@ -5147,11 +5194,6 @@
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
},
"cookie": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
},
"cookie-signature": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -5838,9 +5880,9 @@
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
},
"ejs": {
"version": "3.1.8",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
"integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
"version": "3.1.10",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
"integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
"requires": {
"jake": "^10.8.5"
}
@@ -6830,16 +6872,16 @@
}
},
"express": {
"version": "4.18.2",
"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
"version": "4.19.2",
"resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
"integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
"requires": {
"accepts": "~1.3.8",
"array-flatten": "1.1.1",
"body-parser": "1.20.1",
"body-parser": "1.20.2",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
"cookie": "0.5.0",
"cookie": "0.6.0",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "2.0.0",
@@ -6872,6 +6914,42 @@
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
},
"body-parser": {
"version": "1.20.2",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
"requires": {
"bytes": "3.1.2",
"content-type": "~1.0.5",
"debug": "2.6.9",
"depd": "2.0.0",
"destroy": "1.2.0",
"http-errors": "2.0.0",
"iconv-lite": "0.4.24",
"on-finished": "2.4.1",
"qs": "6.11.0",
"raw-body": "2.5.2",
"type-is": "~1.6.18",
"unpipe": "1.0.0"
},
"dependencies": {
"content-type": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
}
}
},
"bytes": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
},
"cookie": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="
},
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -6890,12 +6968,15 @@
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
},
"qs": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"raw-body": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
"requires": {
"side-channel": "^1.0.4"
"bytes": "3.1.2",
"http-errors": "2.0.0",
"iconv-lite": "0.4.24",
"unpipe": "1.0.0"
}
},
"safe-buffer": {
@@ -7014,14 +7095,6 @@
"resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
"integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ=="
},
"fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
"requires": {
"to-regex-range": "^5.0.1"
}
},
"finalhandler": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -7111,9 +7184,9 @@
"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
},
"follow-redirects": {
"version": "1.14.8",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
"integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="
"version": "1.15.6",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
},
"fork-ts-checker-webpack-plugin": {
"version": "6.5.2",
@@ -7218,6 +7291,16 @@
}
}
},
"form-data": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
"mime-types": "^2.1.12"
}
},
"forwarded": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -7896,9 +7979,9 @@
}
},
"ip": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
"integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
"integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ=="
},
"ipaddr.js": {
"version": "2.0.1",
@@ -13187,6 +13270,11 @@
}
}
},
"proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
},
"psl": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -13202,6 +13290,14 @@
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
"integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="
},
"qs": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"requires": {
"side-channel": "^1.0.4"
}
},
"querystringify": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -13238,24 +13334,6 @@
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
},
"raw-body": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
"requires": {
"bytes": "3.1.2",
"http-errors": "2.0.0",
"iconv-lite": "0.4.24",
"unpipe": "1.0.0"
},
"dependencies": {
"bytes": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
}
}
},
"react": {
"version": "17.0.1",
"resolved": "https://registry.npmjs.org/react/-/react-17.0.1.tgz",
@@ -14924,9 +15002,9 @@
"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
},
"tar": {
"version": "6.1.15",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
"integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
"integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
"requires": {
"chownr": "^2.0.0",
"fs-minipass": "^2.0.0",
@@ -15506,9 +15584,9 @@
}
},
"webpack-dev-middleware": {
"version": "5.3.3",
"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
"version": "5.3.4",
"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
"integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
"requires": {
"colorette": "^2.0.10",
"memfs": "^3.4.3",
@@ -15518,9 +15596,9 @@
},
"dependencies": {
"ajv": {
"version": "8.11.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
"integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
"version": "8.12.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -15555,14 +15633,14 @@
}
},
"schema-utils": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
"requires": {
"@types/json-schema": "^7.0.9",
"ajv": "^8.8.0",
"ajv": "^8.9.0",
"ajv-formats": "^2.1.1",
"ajv-keywords": "^5.0.0"
"ajv-keywords": "^5.1.0"
}
}
}

View File

@@ -9,7 +9,7 @@
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"axios": "^0.21.2",
"axios": "^1.6.0",
"bootstrap": "^4.5.3",
"jss-rtl": "^0.3.0",
"node-sass": "^9.0.0",

View File

@@ -1,4 +1,6 @@
FROM quay.io/soketi/soketi:latest-16-debian
ARG NODE_VERSION=16-debian
ARG BASE_IMAGE_TAG_PREFIX=latest
FROM quay.io/soketi/soketi:${BASE_IMAGE_TAG_PREFIX}-${NODE_VERSION}
LABEL maintainer="Er-Niebla <er.niebla@gmail.com>"

View File

@@ -142,7 +142,7 @@ RUN echo "" >> ~/.bashrc && \
ARG COMPOSER_VERSION=2
ENV COMPOSER_VERSION ${COMPOSER_VERSION}
RUN set -eux; \
if [ "$COMPOSER_VERSION" = "1" ] || [ "$COMPOSER_VERSION" = "2" ]; then \
if [ "$COMPOSER_VERSION" = "1" ] || [ "$COMPOSER_VERSION" = "2" ] || [ "$COMPOSER_VERSION" = "2.2" ]; then \
composer self-update --${COMPOSER_VERSION}; \
else \
composer self-update ${COMPOSER_VERSION}; \
@@ -345,7 +345,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
apt-get install -yqq pkg-config php-xml php${LARADOCK_PHP_VERSION}-xml && \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install xdebug-3.2.1; \
pecl install xdebug-3.3.0; \
else \
pecl install xdebug-3.1.6; \
fi; \
@@ -464,8 +464,12 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini; \
php -m | grep -oiE '^mongo$'; \
else \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ] ;}; then \
pecl install mongodb-1.9.2; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "4" ]; then \
if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
pecl install mongodb-1.9.2; \
else \
pecl install mongodb-1.16.2; \
fi; \
else \
pecl install mongodb; \
fi; \
@@ -576,6 +580,8 @@ RUN set -eux; \
echo '' | pecl -q install swoole-4.5.11; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
echo '' | pecl -q install swoole-4.8.12; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
echo '' | pecl -q install swoole-5.1.2; \
else \
echo '' | pecl -q install swoole; \
fi; \
@@ -697,13 +703,8 @@ RUN if [ ${INSTALL_GRAPHVIZ} = true ]; then \
ARG INSTALL_IONCUBE=false
RUN if [ ${INSTALL_IONCUBE} = true ]; then \
if [ ${LARADOCK_PHP_VERSION} = "8.1" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.4" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.3" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.2" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.1" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.0" ] \
|| [ ${LARADOCK_PHP_VERSION} = "5.6" ]; then \
if [ ${LARADOCK_PHP_VERSION} != "8.3" ] \
&& [ ${LARADOCK_PHP_VERSION} != "8.0" ]; then \
# Install the php ioncube loader
curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
&& tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \
@@ -725,7 +726,7 @@ ARG INSTALL_DRUPAL_CONSOLE=false
RUN if [ ${INSTALL_DRUPAL_CONSOLE} = true ]; then \
apt-get -y install mysql-client && \
curl https://drupalconsole.com/installer -L -o drupal.phar && \
curl https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.7/drupal.phar -L -o drupal.phar && \
mv drupal.phar /usr/local/bin/drupal && \
chmod +x /usr/local/bin/drupal \
;fi
@@ -1116,7 +1117,7 @@ RUN set -eux; \
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
apt-get update -yqq && \
ACCEPT_EULA=Y apt-get install -yqq msodbcsql17 mssql-tools unixodbc unixodbc-dev libgss3 odbcinst locales && \
ACCEPT_EULA=Y apt-get install -yqq msodbcsql18 mssql-tools18 unixodbc unixodbc-dev libgss3 odbcinst locales && \
ln -sfn /opt/mssql-tools/bin/sqlcmd /usr/bin/sqlcmd && \
ln -sfn /opt/mssql-tools/bin/bcp /usr/bin/bcp && \
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
@@ -1131,6 +1132,8 @@ RUN set -eux; \
pecl install pdo_sqlsrv-5.9.0 sqlsrv-5.9.0 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70400" ]; then \
pecl install pdo_sqlsrv-5.10.1 sqlsrv-5.10.1 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ]; then \
pecl install pdo_sqlsrv-5.11.1 sqlsrv-5.11.1 \
;else \
pecl install pdo_sqlsrv sqlsrv \
;fi && \
@@ -1862,6 +1865,21 @@ RUN if [ ${INSTALL_JDK} = true ]; then \
&& update-ca-certificates -f \
;fi
###########################################################################
# Github CLI:
###########################################################################
ARG INSTALL_GITHUB_CLI=false
RUN if [ ${INSTALL_GITHUB_CLI} = true ]; then \
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
&& chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
&& apt update \
&& apt install gh -y \
;fi
#
#--------------------------------------------------------------------------
# Final Touch

View File

@@ -71,6 +71,11 @@ alias rollback="php artisan migrate:rollback"
alias seed="php artisan db:seed"
alias serve="php artisan serve --quiet &"
alias pint="./vendor/bin/pint"
alias pest="./vendor/bin/pest"
alias phpstan="./vendor/bin/phpstan"
alias php-cs-fixer="./vendor/bin/php-cs-fixer"
alias phpunit="./vendor/bin/phpunit"
alias pu="phpunit"
alias puf="phpunit --filter"