Commit 24574721 authored by Адлан Шамавов's avatar Адлан Шамавов
Browse files

Merge branch 'main' into 'PTPS_Controller_9' 

# Conflicts:
#   src/Action/Functions.php
#   src/Controller/HomeController.php
parents 4cbd2e57 8b933093

compose.override.yaml

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
version: '3'



services:

###> doctrine/doctrine-bundle ###

  database:

    ports:

      - "5432"

###< doctrine/doctrine-bundle ###



###> symfony/mailer ###

  mailer:

    image: axllent/mailpit

    ports:

      - "1025"

      - "8025"

    environment:

      MP_SMTP_AUTH_ACCEPT_ANY: 1

      MP_SMTP_AUTH_ALLOW_INSECURE: 1

###< symfony/mailer ###

compose.yaml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
version: '3'



services:

###> doctrine/doctrine-bundle ###

  database:

    image: postgres:${POSTGRES_VERSION:-16}-alpine

    environment:

      POSTGRES_DB: ${POSTGRES_DB:-app}

      # You should definitely change the password in production

      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-!ChangeMe!}

      POSTGRES_USER: ${POSTGRES_USER:-app}

    healthcheck:

      test: ["CMD", "pg_isready"]

      timeout: 5s

      retries: 5

      start_period: 60s

    volumes:

      - database_data:/var/lib/postgresql/data:rw

      # You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!

      # - ./docker/db/data:/var/lib/postgresql/data:rw

###< doctrine/doctrine-bundle ###



volumes:

###> doctrine/doctrine-bundle ###

  database_data:

###< doctrine/doctrine-bundle ###

src/Controller/HomeController.php

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
namespace App\Controller;



use App\Action\Functions;

use App\Service\FileUploader;

use App\Requests\{

    SortPriceRequest,

    SearchRequest,