Skip to content

Commit fd477ee

Browse files
authored
Merge pull request #20 from MRR-Group/main
pre 0.0.4
2 parents 9b2a283 + 93f7fa3 commit fd477ee

File tree

7 files changed

+4
-16
lines changed

7 files changed

+4
-16
lines changed

.env.actions

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ DOCKER_USER=1000:1000
55
STEAM_CLIENT_SECRET=STEAM_API_KEY
66
STEAM_REDIRECT_URI="http://localhost/steam/callback"
77

8-
LARAVEL_CLOUDFLARE_ENABLED=false
9-
10-
APP_NAME=steam-buddy
8+
APP_NAME="Steam Buddy"
119
APP_ENV=local
1210
APP_KEY=
1311
APP_DEBUG=true

.env.example

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ DOCKER_USER=1000:1000
55
STEAM_CLIENT_SECRET=STEAM_API_KEY
66
STEAM_REDIRECT_URI="http://localhost/steam/callback"
77

8-
APP_NAME=steam-buddy
8+
APP_NAME="Steam Buddy"
99
APP_ENV=local
1010
APP_KEY=
1111
APP_DEBUG=true
1212
APP_TIMEZONE=UTC
1313
APP_URL=http://localhost
1414

15-
LARAVEL_CLOUDFLARE_ENABLED=false
16-
1715
APP_LOCALE=en
1816
APP_FALLBACK_LOCALE=en
1917
APP_FAKER_LOCALE=en_US

bootstrap/app.php

+1-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Illuminate\Foundation\Configuration\Exceptions;
1111
use Illuminate\Foundation\Configuration\Middleware;
1212
use Illuminate\Http\Middleware\AddLinkHeadersForPreloadedAssets;
13-
use Illuminate\Http\Middleware\TrustProxies;
1413

1514
return Application::configure(basePath: dirname(__DIR__))
1615
->withRouting(
@@ -19,10 +18,7 @@
1918
health: "/up",
2019
)
2120
->withMiddleware(function (Middleware $middleware): void {
22-
$middleware->replace(
23-
TrustProxies::class,
24-
Monicahq\Cloudflare\Http\Middleware\TrustProxies::class,
25-
);
21+
$middleware->trustProxies(at: '*');
2622

2723
$middleware->web(append: [
2824
HandleInertiaRequests::class,

composer.json

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"laravel/sanctum": "^4.0",
1313
"laravel/socialite": "^5.12",
1414
"laravel/tinker": "^2.9",
15-
"monicahq/laravel-cloudflare": "^3.7",
1615
"predis/predis": "^2.0",
1716
"socialiteproviders/steam": "^4.2",
1817
"tightenco/ziggy": "^2.0"

docker/actions/init.sh

-2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ php artisan key:generate
1212
php artisan migrate
1313
php artisan cache:clear
1414
php artisan config:clear
15-
16-

docker/production/php/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ RUN apk update
44
RUN apk --no-cache add bash git
55

66
COPY . /app
7+
COPY ./.env.example /app/.env
78
WORKDIR /app
89
RUN npm install
910
RUN npm run build

docker/production/php/init.sh

-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ composer install
55
cp /build /app/public
66

77
php artisan migrate
8-
php artisan cloudflare:reload
9-

0 commit comments

Comments
 (0)