diff --git a/resources/docker/root/run/docker-entrypoint.sh b/resources/docker/root/run/docker-entrypoint.sh index 454c6331..87ea700b 100755 --- a/resources/docker/root/run/docker-entrypoint.sh +++ b/resources/docker/root/run/docker-entrypoint.sh @@ -346,6 +346,18 @@ echo "set nginx tmp permissions..." mkdir -p /var/lib/nginx/tmp/client_body chown -R $UUID:$GUID /var/lib/nginx/tmp +# handle URL overwrite +APP_URL="${APP_URL#http://}" +APP_URL="${APP_URL#https://}" + +if { [ -n "$ENABLE_HTTPS" ] && [ "$ENABLE_HTTPS" = "true" ]; } || { [ -n "$FORCE_APP_HTTPS" ] && [ "$FORCE_APP_HTTPS" = "true" ]; }; then + APP_URL="https://${APP_URL}" +else + APP_URL="http://${APP_URL}" +fi +export APP_URL + + # Database Wait check echo "---------------" echo "WAITING FOR $DB_HOST:$DB_PORT..." diff --git a/src/composer.json b/src/composer.json index 68a76129..84b91a35 100644 --- a/src/composer.json +++ b/src/composer.json @@ -35,7 +35,7 @@ "type": "project", "require": { "php": "8.4.*", - "laravel/framework": "11.36.1", + "laravel/framework": "11.37.0", "laravelcollective/html": "dev-6x", "laravel/legacy-factories": "1.4.0", "webonyx/graphql-php": "15.19.1", @@ -46,7 +46,7 @@ "guzzlehttp/guzzle": "7.9.2", "php-http/guzzle7-adapter": "1.1.0", "team-reflex/challonge-php": "dev-master", - "intervention/image": "3.10.1", + "intervention/image": "3.10.2", "intervention/image-laravel": "1.3.0", "laravel/tinker": "2.10.0", "scssphp/scssphp": "2.0.0", diff --git a/src/composer.lock b/src/composer.lock index d86040b6..79a8baf9 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c915b1eda02ca56d97ea8c4170c30839", + "content-hash": "a3d098d68f70ef41f340f6bcf832e156", "packages": [ { "name": "artesaos/seotools", @@ -2344,16 +2344,16 @@ }, { "name": "intervention/image", - "version": "3.10.1", + "version": "3.10.2", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "8230387f14d5727745934673ebe70fdbe161f581" + "reference": "1c68e5fdf443374f3580c5b920a7f177eccdab85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/8230387f14d5727745934673ebe70fdbe161f581", - "reference": "8230387f14d5727745934673ebe70fdbe161f581", + "url": "https://api.github.com/repos/Intervention/image/zipball/1c68e5fdf443374f3580c5b920a7f177eccdab85", + "reference": "1c68e5fdf443374f3580c5b920a7f177eccdab85", "shasum": "" }, "require": { @@ -2400,7 +2400,7 @@ ], "support": { "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/3.10.1" + "source": "https://github.com/Intervention/image/tree/3.10.2" }, "funding": [ { @@ -2416,7 +2416,7 @@ "type": "ko_fi" } ], - "time": "2024-12-27T14:53:08+00:00" + "time": "2025-01-04T07:31:37+00:00" }, { "name": "intervention/image-laravel", @@ -2562,16 +2562,16 @@ }, { "name": "laravel/framework", - "version": "v11.36.1", + "version": "v11.37.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "df06f5163f4550641fdf349ebc04916a61135a64" + "reference": "6cb103d2024b087eae207654b3f4b26646119ba5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/df06f5163f4550641fdf349ebc04916a61135a64", - "reference": "df06f5163f4550641fdf349ebc04916a61135a64", + "url": "https://api.github.com/repos/laravel/framework/zipball/6cb103d2024b087eae207654b3f4b26646119ba5", + "reference": "6cb103d2024b087eae207654b3f4b26646119ba5", "shasum": "" }, "require": { @@ -2621,7 +2621,6 @@ "voku/portable-ascii": "^2.0.2" }, "conflict": { - "mockery/mockery": "1.6.8", "tightenco/collect": "<5.5.33" }, "provide": { @@ -2773,7 +2772,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-12-17T22:32:08+00:00" + "time": "2025-01-02T20:10:21+00:00" }, { "name": "laravel/legacy-factories", @@ -7918,16 +7917,16 @@ }, { "name": "symfony/finder", - "version": "v7.2.0", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49" + "reference": "87a71856f2f56e4100373e92529eed3171695cfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49", - "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49", + "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb", + "reference": "87a71856f2f56e4100373e92529eed3171695cfb", "shasum": "" }, "require": { @@ -7962,7 +7961,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.2.0" + "source": "https://github.com/symfony/finder/tree/v7.2.2" }, "funding": [ { @@ -7978,7 +7977,7 @@ "type": "tidelift" } ], - "time": "2024-10-23T06:56:12+00:00" + "time": "2024-12-30T19:00:17+00:00" }, { "name": "symfony/http-client", @@ -8155,16 +8154,16 @@ }, { "name": "symfony/http-foundation", - "version": "v7.2.0", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e88a66c3997859532bc2ddd6dd8f35aba2711744" + "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e88a66c3997859532bc2ddd6dd8f35aba2711744", - "reference": "e88a66c3997859532bc2ddd6dd8f35aba2711744", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/62d1a43796ca3fea3f83a8470dfe63a4af3bc588", + "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588", "shasum": "" }, "require": { @@ -8213,7 +8212,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.2.0" + "source": "https://github.com/symfony/http-foundation/tree/v7.2.2" }, "funding": [ { @@ -8229,20 +8228,20 @@ "type": "tidelift" } ], - "time": "2024-11-13T18:58:46+00:00" + "time": "2024-12-30T19:00:17+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.2.1", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97" + "reference": "3c432966bd8c7ec7429663105f5a02d7e75b4306" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d8ae58eecae44c8e66833e76cc50a4ad3c002d97", - "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3c432966bd8c7ec7429663105f5a02d7e75b4306", + "reference": "3c432966bd8c7ec7429663105f5a02d7e75b4306", "shasum": "" }, "require": { @@ -8327,7 +8326,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.2.1" + "source": "https://github.com/symfony/http-kernel/tree/v7.2.2" }, "funding": [ { @@ -8343,7 +8342,7 @@ "type": "tidelift" } ], - "time": "2024-12-11T12:09:10+00:00" + "time": "2024-12-31T14:59:40+00:00" }, { "name": "symfony/mailer", @@ -9528,16 +9527,16 @@ }, { "name": "symfony/translation", - "version": "v7.2.0", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5" + "reference": "e2674a30132b7cc4d74540d6c2573aa363f05923" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/dc89e16b44048ceecc879054e5b7f38326ab6cc5", - "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5", + "url": "https://api.github.com/repos/symfony/translation/zipball/e2674a30132b7cc4d74540d6c2573aa363f05923", + "reference": "e2674a30132b7cc4d74540d6c2573aa363f05923", "shasum": "" }, "require": { @@ -9603,7 +9602,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.2.0" + "source": "https://github.com/symfony/translation/tree/v7.2.2" }, "funding": [ { @@ -9619,7 +9618,7 @@ "type": "tidelift" } ], - "time": "2024-11-12T20:47:56+00:00" + "time": "2024-12-07T08:18:10+00:00" }, { "name": "symfony/translation-contracts", diff --git a/src/package-lock.json b/src/package-lock.json index 900a6843..8c41ed4e 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -20,7 +20,7 @@ "laravel-mix-purgecss": "6.0.0", "postcss": "8.4.49", "resolve-url-loader": "5.0.0", - "sass": "1.83.0", + "sass": "1.83.1", "sass-loader": "16.0.4" } }, @@ -8603,9 +8603,9 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.83.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.0.tgz", - "integrity": "sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==", + "version": "1.83.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz", + "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/src/package.json b/src/package.json index c4421075..4f40e351 100644 --- a/src/package.json +++ b/src/package.json @@ -13,7 +13,7 @@ "laravel-mix-purgecss": "6.0.0", "postcss": "8.4.49", "resolve-url-loader": "5.0.0", - "sass": "1.83.0", + "sass": "1.83.1", "sass-loader": "16.0.4" }, "dependencies": {