diff --git a/.env.example b/.env.example index 3360aae8..ee8d219c 100644 --- a/.env.example +++ b/.env.example @@ -407,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 diff --git a/docker-compose.yml b/docker-compose.yml index 78c0290e..1646b14d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,6 +181,10 @@ services: - 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 @@ -302,6 +306,10 @@ services: - INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT} - INSTALL_DNSUTILS=${PHP_FPM_INSTALL_DNSUTILS} - INSTALL_POPPLER_UTILS=${PHP_FPM_INSTALL_POPPLER_UTILS} + - 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 @@ -375,6 +383,10 @@ 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 diff --git a/mysql/Dockerfile b/mysql/Dockerfile index ca751265..ceee011e 100644 --- a/mysql/Dockerfile +++ b/mysql/Dockerfile @@ -1,8 +1,6 @@ ARG MYSQL_VERSION FROM mysql:${MYSQL_VERSION} -LABEL maintainer="Mahmoud Zalt " - ##################################### # Set Timezone ##################################### @@ -15,10 +13,6 @@ COPY my.cnf /etc/mysql/conf.d/my.cnf RUN chmod 0444 /etc/mysql/conf.d/my.cnf -RUN if [ ${MYSQL_VERSION} > '8.4.0-0.000' ]; then \ - echo 'mysql_native_password=on' >> /etc/mysql/conf.d/my.cnf \ -else \ - echo 'default-authentication-plugin=mysql_native_password' >> /etc/mysql/conf.d/my.cnf \ -;fi - -EXPOSE 3306 +RUN if [ ${MYSQL_MAJOR} = '8.0' ]; then \ + echo 'default-authentication-plugin=mysql_native_password' >> /etc/mysql/conf.d/my.cnf; \ + fi diff --git a/react/package-lock.json b/react/package-lock.json index 96f63999..777b5ba6 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -4741,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": { @@ -5870,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" } @@ -7085,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", @@ -15000,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", diff --git a/workspace/Dockerfile b/workspace/Dockerfile index fd5f6776..27a440d0 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -580,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; \ diff --git a/workspace/aliases.sh b/workspace/aliases.sh index 9d756b2f..3f2e3379 100644 --- a/workspace/aliases.sh +++ b/workspace/aliases.sh @@ -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"