diff --git a/.env.example b/.env.example index c6f696dd84c187893c301ec057886685cfc227be..83ec4f50049b7558132b5e7f82a4a3c21bd63eea 100644 --- a/.env.example +++ b/.env.example @@ -30,4 +30,9 @@ # ---- symfony/messenger ----- #MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0 +# ---------------------------- + +# --------- outports --------- +#NGINX_PORT="80" +#DB_PORT="5432" # ---------------------------- \ No newline at end of file diff --git a/app/composer.json b/app/composer.json index 79c04509aa1273ba13bb8af6e591ccdef8ce4192..564d77eb4e396930f5f79afd26e5d1388479ff03 100644 --- a/app/composer.json +++ b/app/composer.json @@ -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.*", diff --git a/docker-compose.yml b/docker-compose.yml index 3a73066c4d124e570edb5c282ffb141297ae0d1e..d1307d3b493761cc8286fd8a09122582a38403f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: diff --git a/docker/App.Dockerfile b/docker/app/Dockerfile similarity index 86% rename from docker/App.Dockerfile rename to docker/app/Dockerfile index ce0945b11c2f714ad3429eb403f66139bd8deb43..3dc122da9a18b10de3d35eb3deb8ae445f177c2c 100644 --- a/docker/App.Dockerfile +++ b/docker/app/Dockerfile @@ -1,6 +1,6 @@ -FROM php:fpm-alpine +FROM php:8.3-fpm-alpine -WORKDIR var/www/project +WORKDIR /app COPY app . COPY .env . diff --git a/docker/App.Dockerfile.dockerignore b/docker/app/Dockerfile.dockerignore similarity index 100% rename from docker/App.Dockerfile.dockerignore rename to docker/app/Dockerfile.dockerignore diff --git a/nginx/default.conf b/docker/nginx/default.conf similarity index 95% rename from nginx/default.conf rename to docker/nginx/default.conf index 3a58e907fd217914bb9af4c45f636def99d53258..8b660bf000099080a7afd2824243235d8815ce51 100644 --- a/nginx/default.conf +++ b/docker/nginx/default.conf @@ -2,7 +2,7 @@ server { listen 80; index index.php; server_name localhost; - root /var/www/project/public; + root /app/public; location / { try_files $uri /index.php$is_args$args; }