Commit 50e78722 authored by Александр Плохих's avatar Александр Плохих 🌔
Browse files

Merge branch 'STA-931' into STA-959

parents 00f560f4 3869a460

.env.example

+5 −0
Original line number Diff line number Diff line
@@ -31,3 +31,8 @@ 
# ---- symfony/messenger -----

#MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0

# ----------------------------



# --------- outports ---------

#NGINX_PORT="80"

#DB_PORT="5432"

# ----------------------------
 
 No newline at end of file

app/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
        "symfony/doctrine-messenger": "6.4.*",

        "symfony/dotenv": "6.4.*",

        "symfony/expression-language": "6.4.*",

        "symfony/flex": "^2",

        "symfony/flex": "^2.4",

        "symfony/form": "6.4.*",

        "symfony/framework-bundle": "6.4.*",

        "symfony/http-client": "6.4.*",

docker-compose.yml

+8 −10
Original line number Diff line number Diff line
@@ -11,17 +11,16 @@ services: 
    networks:

      - app

    ports:

      - '5432:5432'

      - '${DB_PORT}:5432'



  nginx:

    image: nginx:stable-alpine

    image: nginx:1.25.5-alpine

    container_name: ${APP_NAME}-nginx

    ports:

      - '80:80'

      - '${NGINX_PORT}:80'

    volumes:

      - ./app:/var/www/project

      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf

      - ./.env:/var/www/project/.env

      - ./app/public:/app/public

      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf

    networks:

      - app

    links:
@@ -32,12 +31,11 @@ services: 
  app:

    build:

      context: .

      dockerfile: docker/App.Dockerfile

      dockerfile: docker/app/Dockerfile

    container_name: ${APP_NAME}-app

    ports:

      - '9000:9000'

    volumes:

      - ./app:/var/www/project

      - ./app:/app

      - ./.env:/app/.env

    networks:

      - app

    depends_on:

docker/App.Dockerfile→docker/app/Dockerfile

+2 −2
Original line number Diff line number Diff line 
FROM php:fpm-alpine

FROM php:8.3-fpm-alpine



WORKDIR var/www/project

WORKDIR /app



COPY app .

COPY .env .