From 993691bfbb8b3bb238eb0cbebde203dda0b9a724 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 04:04:29 +0000 Subject: [PATCH 1/9] 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] --- react/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index e60b7258..5b881d6a 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -15023,9 +15023,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", From 2393f16384cad6aac05ca53919ac3ccdd836f01a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 05:08:59 +0000 Subject: [PATCH 2/9] 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] --- react/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index 96f63999..13a61f9a 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -5870,9 +5870,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" } From 8633d48ff1eb1a19d40ba9c865fd20e9b6e2fdc6 Mon Sep 17 00:00:00 2001 From: erikn69 Date: Wed, 5 Jun 2024 12:52:11 -0500 Subject: [PATCH 3/9] Workspace: add new aliases --- workspace/aliases.sh | 5 +++++ 1 file changed, 5 insertions(+) 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" From 1e043361abba5db0a4dd81a2670007a86054ba1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 04:52:41 +0000 Subject: [PATCH 4/9] 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] --- react/package-lock.json | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index 96f63999..4c988a48 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": { @@ -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", From 7a6e5479105f0d31ad424a94687d3c395a19f0b5 Mon Sep 17 00:00:00 2001 From: erikn69 Date: Thu, 27 Jun 2024 08:48:28 -0500 Subject: [PATCH 5/9] Fix oracle instant client args from env --- docker-compose.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 83a23de1..272cd8e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -180,6 +180,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 @@ -300,6 +304,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 @@ -370,6 +378,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 From 308358fd0ecc7d8462cd2fd78f9718d736a52204 Mon Sep 17 00:00:00 2001 From: erikn69 Date: Thu, 27 Jun 2024 09:13:51 -0500 Subject: [PATCH 6/9] Fix swoole --- workspace/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index fd5f6776..a8e023a2 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.3; \ else \ echo '' | pecl -q install swoole; \ fi; \ From c586a5bf8a1b5c16ad686607508d8343eced5919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Peti?= Date: Sun, 7 Jul 2024 11:19:44 +0200 Subject: [PATCH 7/9] Fix for bug #3535 --- mysql/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/Dockerfile b/mysql/Dockerfile index ca751265..8aadacc5 100644 --- a/mysql/Dockerfile +++ b/mysql/Dockerfile @@ -17,7 +17,7 @@ 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 \ +;else \ echo 'default-authentication-plugin=mysql_native_password' >> /etc/mysql/conf.d/my.cnf \ ;fi From cd1b3834cc529cada3f45c6bf3e5041dda58b8fe Mon Sep 17 00:00:00 2001 From: erikn69 Date: Wed, 17 Jul 2024 08:50:55 -0500 Subject: [PATCH 8/9] Fix Swoole 2 --- workspace/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index a8e023a2..27a440d0 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -581,7 +581,7 @@ RUN set -eux; \ 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.3; \ + echo '' | pecl -q install swoole-5.1.2; \ else \ echo '' | pecl -q install swoole; \ fi; \ From a549510dd012ce0d2d24d2777b983e4ff198ee7b Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Wed, 24 Jul 2024 17:06:35 +0800 Subject: [PATCH 9/9] fix: mysql service exit --- .env.example | 3 ++- mysql/Dockerfile | 12 +++--------- 2 files changed, 5 insertions(+), 10 deletions(-) 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/mysql/Dockerfile b/mysql/Dockerfile index 8aadacc5..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