diff --git a/docker/Dockerfile b/docker/Dockerfile index 03a2f55..df1200c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,13 +23,8 @@ ENV VITE_APP_NAME=Investbrain COPY . /var/www/app WORKDIR /var/www/app -# Set permissions -RUN chown -R www-data:www-data . \ - && chmod -R 775 ./storage \ - && chmod +x ./docker/entrypoint.sh \ - && usermod -s /bin/bash www-data \ # Install common php extension dependencies - && apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y \ nginx \ libfreetype-dev \ libjpeg62-turbo-dev \ @@ -38,15 +33,18 @@ RUN chown -R www-data:www-data . \ libzip-dev \ libicu-dev \ supervisor \ - && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install -j$(nproc) \ - gd \ - zip \ - pdo_mysql \ - mysqli \ - intl \ -# remove default nginx config - && rm /etc/nginx/sites-enabled/default + && docker-php-ext-configure gd --with-freetype --with-jpeg \ + && docker-php-ext-install -j$(nproc) \ + gd pgsql bcmath zip pdo_mysql mysqli intl \ + && apt-get -y autoremove \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +# Set permissions +RUN chown -R www-data:www-data . \ + && chmod -R 775 ./storage \ + && chmod +x ./docker/entrypoint.sh \ + && usermod -s /bin/bash www-data # Install Composer and Node.js RUN apt-get update && apt-get install -y \ @@ -61,6 +59,9 @@ RUN apt-get update && apt-get install -y \ RUN composer install --no-scripts --optimize-autoloader \ && npm install && npm run build +# Remove default nginx config +RUN rm /etc/nginx/sites-enabled/default + # Copy over configs COPY ./docker/nginx.conf /etc/nginx/conf.d/default.conf COPY ./docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf diff --git a/routes/web.php b/routes/web.php index 0d07985..d961542 100644 --- a/routes/web.php +++ b/routes/web.php @@ -11,9 +11,6 @@ use App\Http\Controllers\InvitedOnboardingController; use Laravel\Jetstream\Http\Controllers\Livewire\PrivacyPolicyController; use Laravel\Jetstream\Http\Controllers\Livewire\TermsOfServiceController; -Route::get('/test', function() { - dd(env('APP_NAME'), env('DB_CONNECTION')); -}); Route::get('/', function () { if (!config('investbrain.self_hosted', true) && View::exists('landing-page::index')) {