From a37bf685ef33756a5a5e3087d6c5663f42586961 Mon Sep 17 00:00:00 2001 From: Shift Date: Mon, 17 Feb 2025 03:21:56 +0000 Subject: [PATCH 1/4] Bump dependencies for Laravel 12 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 3db21cd..f80ca32 100644 --- a/composer.json +++ b/composer.json @@ -10,16 +10,16 @@ ], "require": { "php": "^8.0.2", - "illuminate/support": "^9.0|^10.0|^11.0", + "illuminate/support": "^9.0|^10.0|^11.0|^12.0", "laravel-workflow/laravel-workflow": "^1.0" }, "require-dev": { "fakerphp/faker": "^1.9.1", "jenssegers/mongodb": "^3.9", "mockery/mockery": "^1.4.4", - "mongodb/mongodb": "1.11", - "orchestra/testbench": "^7.29", - "phpunit/phpunit": "^9.5.10" + "mongodb/mongodb": "1.11|^1.20", + "orchestra/testbench": "^7.29|^10.0", + "phpunit/phpunit": "^9.5.10|^11.5.3" }, "autoload": { "psr-4": { From 5baea67e224f7e567de464aef6f20ae7dd8895d6 Mon Sep 17 00:00:00 2001 From: Richard McDaniel Date: Tue, 18 Feb 2025 05:27:00 +0000 Subject: [PATCH 2/4] Add Laravel 12 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f80ca32..26b40c5 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ "jenssegers/mongodb": "^3.9", "mockery/mockery": "^1.4.4", "mongodb/mongodb": "1.11|^1.20", - "orchestra/testbench": "^7.29|^10.0", - "phpunit/phpunit": "^9.5.10|^11.5.3" + "orchestra/testbench": "^7.29", + "phpunit/phpunit": "^9.5.10" }, "autoload": { "psr-4": { From 6bddaa6a2a82a743a9c7e4a4ad67dc2a04a01d2d Mon Sep 17 00:00:00 2001 From: Richard McDaniel Date: Tue, 18 Feb 2025 05:28:32 +0000 Subject: [PATCH 3/4] Add Laravel 12 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 26b40c5..62af933 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "fakerphp/faker": "^1.9.1", "jenssegers/mongodb": "^3.9", "mockery/mockery": "^1.4.4", - "mongodb/mongodb": "1.11|^1.20", + "mongodb/mongodb": "1.11", "orchestra/testbench": "^7.29", "phpunit/phpunit": "^9.5.10" }, From 25e8e2bbca7a34facbb35bd7d77cbee129816602 Mon Sep 17 00:00:00 2001 From: Richard McDaniel Date: Tue, 18 Feb 2025 05:36:05 +0000 Subject: [PATCH 4/4] Fix mssql --- docker/Dockerfile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 77e7614..824bc06 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 -LABEL maintainer="Taylor Otwell" +LABEL maintainer="Richard McDaniel" ARG WWWGROUP ARG NODE_VERSION=18 @@ -40,18 +40,19 @@ RUN apt-get update \ && apt-get install -y mysql-client \ && apt-get install -y postgresql-client-$POSTGRES_VERSION \ && apt-get install -y unixodbc-dev unixodbc odbcinst \ - # && cd /tmp \ - # && curl -O https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/msodbcsql17/msodbcsql17_17.10.1.1-1_amd64.deb \ - # && curl -O https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/mssql-tools/mssql-tools_17.10.1.1-1_amd64.deb \ - # && ACCEPT_EULA=Y dpkg -i msodbcsql17_17.10.1.1-1_amd64.deb \ - # && ACCEPT_EULA=Y dpkg -i mssql-tools_17.10.1.1-1_amd64.deb \ - # && apt-get install -f \ - # && pecl update-channels \ - # && pecl install sqlsrv \ - # && pecl install pdo_sqlsrv \ - # && echo "extension=sqlsrv.so" | tee -a /etc/php/8.2/mods-available/sqlsrv.ini \ - # && echo "extension=pdo_sqlsrv.so" | tee -a /etc/php/8.2/mods-available/pdo_sqlsrv.ini \ - # && phpenmod sqlsrv pdo_sqlsrv \ + && curl -sSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft.gpg >/dev/null \ + && echo "deb [signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/ubuntu/22.04/prod jammy main" | tee /etc/apt/sources.list.d/mssql-release.list \ + && apt-get update \ + && ACCEPT_EULA=Y apt-get install -y msodbcsql17 mssql-tools \ + && echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc \ + && echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> /etc/profile.d/mssql.sh \ + && apt-get install -y php-pear php-dev \ + && pecl channel-update pecl.php.net \ + && pecl install sqlsrv \ + && pecl install pdo_sqlsrv \ + && echo "extension=sqlsrv.so" > /etc/php/8.2/mods-available/sqlsrv.ini \ + && echo "extension=pdo_sqlsrv.so" > /etc/php/8.2/mods-available/pdo_sqlsrv.ini \ + && phpenmod sqlsrv pdo_sqlsrv \ && apt-get -y autoremove \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*