Merge pull request #1059 from Lan2Play/dev

hotfix for #1057 and Dependency updates
Lan2Play · Jan 6, 2025 · 6040945 · 6040945
2 parents b5d3ebc + 8c991fa
commit 6040945
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 44 deletions.
diff --git 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
@@ -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
diff --git a/src/package-lock.json b/src/package-lock.json
diff --git 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": {