Commit c5133869 authored by Nikita Chernykh's avatar Nikita Chernykh
Browse files

Merge branch 'STA-930' into 'main' 

STA-930

See merge request !11
parents 597b7be0 bdf44fdf

.gitignore

+3 −1
Original line number Diff line number Diff line
@@ -24,3 +24,5 @@ 
/assets/vendor/

###< symfony/asset-mapper ###

/.idea

.env

.env.test
 
 No newline at end of file

docker-compose.yaml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
version: "3"



services:

  database:

    container_name: postgres

    image: postgres:16.2-alpine

    environment:

      POSTGRES_USER: ${POSTGRES_USER}

      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}

      POSTGRES_HOST_AUTH_METHOD: trust

    ports:

      - "${DATABASE_PORT}:5432"

    networks:

      - internal

  nginx:

    build:

      dockerfile: ./docker/nginx/Dockerfile

      args:

        COMPOSER_AUTH: "{}"

        APP_BASE_DIR: ${APP_BASE_DIR-.}

    volumes:

      - ".:/app"

    ports:

      - '${NGINX_PORT}:80'

    networks:

      - internal

  app:

    build:

      dockerfile: ./docker/php/Dockerfile

      args:

        COMPOSER_AUTH: "{}"

        APP_BASE_DIR: ${APP_BASE_DIR-.}

    volumes:

      - ".:/app"

    restart: unless-stopped

    networks:

      - internal



networks:

  internal:

    driver: bridge
 
 No newline at end of file

docker/nginx/Dockerfile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
FROM nginx:alpine



WORKDIR "/app"



ARG APP_BASE_DIR

COPY $APP_BASE_DIR .

RUN cp docker/nginx/default.conf /etc/nginx/conf.d/default.conf
 
 No newline at end of file

docker/nginx/default.conf

0 → 100644
+31 −0
Original line number Diff line number Diff line 
server {

    #This config is based on https://github.com/daylerees/laravel-website-configs/blob/6db24701073dbe34d2d58fea3a3c6b3c0cd5685b/nginx.conf



     # The location of our project's public directory.

    root /app/public;



     # Point index to the Laravel front controller.

    index           index.php;



    location / {

        # URLs to attempt, including pretty ones.

        try_files   $uri $uri/ /index.php?$query_string;

    }



    # Remove trailing slash to please routing system.

    if (!-d $request_filename) {

            rewrite     ^/(.+)/$ /$1 permanent;

    }



    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000

    location ~ \.php$ {

        fastcgi_split_path_info ^(.+\.php)(/.+)$;

    #   # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini

    #   # With php5-fpm:

        fastcgi_pass app:9000;

        fastcgi_index index.php;

        include fastcgi_params;

        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

        fastcgi_param PATH_INFO $fastcgi_path_info;

    }

}
 
 No newline at end of file

docker/Dockerfile→docker/php/Dockerfile

+8 −4
Original line number Diff line number Diff line
@@ -2,11 +2,13 @@ FROM php:fpm-alpine 


WORKDIR "/app"



COPY .. .

ARG APP_BASE_DIR

COPY $APP_BASE_DIR .



RUN apk update && \

    apk add libpq-dev && \

    docker-php-ext-install pdo pdo_pgsql pgsql



RUN set -ex \

  && apk --no-cache add \

    postgresql-dev



RUN docker-php-ext-install pdo pdo_pgsql
@@ -16,4 +18,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local 


RUN composer install



RUN chmod -R 777 /app/var



CMD ["php-fpm"]