Merge branch 'STA-931' into 'main'

Sta 931 See merge request !12

Merge branch 'STA-931' into 'main'
78eca911 · Nikita Chernykh · 05efb2b8 · e8fcc3c2 · 78eca911 · 78eca911
Commit 78eca911 authored 11 months ago by Nikita Chernykh
--- a/src/Repository/.gitignore
+++ b/src/Repository/.gitignore
--- a/translations/.gitignore
+++ b/translations/.gitignore
--- a/src/Kernel.php
+++ b/src/Kernel.php
--- a/app/src/Repository/.gitignore
+++ b/app/src/Repository/.gitignore
--- a/symfony.lock
+++ b/symfony.lock
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
--- a/app/translations/.gitignore
+++ b/app/translations/.gitignore
--- a/compose.override.yaml
+++ b/compose.override.yaml
-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 ###
--- a/compose.yaml
+++ b/compose.yaml
-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 ###
--- a/composer.lock
+++ b/composer.lock
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
+version: '3.1'
+services:
+  db:
+    image: postgres:16.2
+    environment:
+      POSTGRES_PASSWORD: 'root'
+      POSTGRES_USER: 'root'
+    networks:
+      - app
+    ports:
+      - '5432:5432'
+  nginx:
+    build:
+      context: ../
+      dockerfile: docker/nginx/Dockerfile
+    ports:
+      - '80:80'
+      - '433:433'
+    networks:
+      - app
+    links:
+      - app
+    depends_on:
+      - app
+  app:
+    build:
+      context: ../
+      dockerfile: docker/php/Dockerfile
+    networks:
+      - app
+    depends_on:
+      - db
+networks:
+  app:
+    driver: bridge
\ No newline at end of file
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
+FROM nginx:alpine
+COPY app app
+ADD docker/nginx/default.conf /etc/nginx/conf.d/
\ No newline at end of file
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
+server {
+    index index.php;
+    error_log  /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+    root /app/public;
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        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;
+    }
+}
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM php:fpm-alpine
 WORKDIR app
-COPY . .
+COPY app .
 RUN apk update && \
    apk add libpq-dev && \

--- a/public/HelloWorld.html
+++ b/public/HelloWorld.html
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-Hello World!
-Hello World !!
-Hello World !!!
-</body>
-</html>
\ No newline at end of file
--- a/public/helloWorld.html
+++ b/public/helloWorld.html
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-hello World
-</body>
-</html>
\ No newline at end of file