Updated to the newer version

Author: Igor Sukhinin

.env

@@ -1,11 +1,11 @@
 # App Settings
 APP_NAME=docker
 APP_PATH=./app
-# To launch the app in dev environment just leave it empty
-APP_ENV=prod
 
-# Dev MySQL Settings
-MYSQL_DATABASE=db
-MYSQL_USER=db
-MYSQL_PASSWORD=db
-MYSQL_ROOT_PASSWORD=root
+# MySQL settings
+DB_HOST=db
+DB_NAME=dbname
+DB_USER=dbuser
+DB_PASS=dbpass
+
+#EOF

.gitignore

@@ -1 +1,7 @@
-.idea
+/.idea
+/etc/log/nginx/
+/etc/db/data/
+!/etc/db/data/.gitkeep
+!/etc/log/nginx/.gitkeep
+
+.env.*

Makefile

@@ -0,0 +1,19 @@
+#!make
+include .env
+export
+
+DOCKER_COMPOSE=docker-compose -p $(APP_NAME) -f "etc/docker-compose/docker-compose.run.yaml"
+
+.DEFAULT_GOAL := help
+
+help:			## Shows this help messages
+	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
+
+build:			## Builds Docker images for the project
+	@docker-compose -f "etc/docker-compose/docker-compose.build.yaml" build
+
+up:				## Starts all containers
+	@${DOCKER_COMPOSE} up
+
+down: 			## Stops all containers
+	@${DOCKER_COMPOSE} down

README.md

@@ -1,88 +1,35 @@
-Nginx + Php-fpm + Apache + MySQL + NodeJS + phpMyAdmin with Docker-Compose 
+nginx + PHP-FPM + Apache + MySQL + NodeJS + phpMyAdmin with Docker-Compose
 ==========================================================================
 
 Initial configuration to install a web environment with the following images:
 
-- nginx: it will be running as a reverse-proxy for Apache; the static data (images, texts, js scripts, etc) will be 
-returned by nginx itself
-- Php-fpm 7.2: it will install `composer` and try to run it with `composer install`
-- Apache (httpd): it will be proxying the requests to PHP-FPM
-- MySQL 8: default access credentials are defined in `.env` file incl. the root password
-- NodeJS: will try to run `npm run dev` or `npm run dev` depending on the settings defined in `.env` file
-- phpMyAdmin: it will be available on the port `5426`, e.g. `http://localhost:5426`
+- nginx: reverse-proxy for Apache and PhpMyAdmin
+- PHP-FPM 8.2 with `composer`
+- Apache (httpd): as a proxy for requests to PHP-FPM
+- MySQL 8: default access credentials are defined in `.env` file
+- NodeJS 21
+- phpMyAdmin 5.2: it will be available on the port `81`, e.g. `http://localhost:81`
 
-## Prerequisites
+## Installation
 
-Please make sure docker & docker-compose are installed on the target machine. 
+### Prerequisites
 
-If you are not sure, please run the following command (Ubuntu):
- 
-```
-sudo apt-get install docker docker-compose -y
-```
-
-## Initial Settings
-
-Navigate to the root directory and open `.env` file for editing:
- 
-```
-# App Settings
-APP_NAME=docker
-APP_PATH=./app
-# To launch the app in dev environment just remove prod
-APP_ENV=prod
-```
-
-## Run Docker-Compose
-
-To build the images and run the configuration please navigate to the root directory and run the following command 
+- Docker 24.0
+- Docker Compose 2.22
 
-```
-docker-compose up -d --build
-```
+### Build and Run
 
-Remove option `-d` if you don't want to run it in the detached mode.
+1. Run `make build` to build the Docker images
+2. Run `make up` to run the Docker containers
 
-If the images are already built just run the following command
+All the commands above can be run with one command:
 
 ```
-docker-compose up -d
+make build && make up
 ```
 
-Docker Management
------------------
-
-### Start Docker containers
-
-When the containers are built you can start the containers by using the following command
-
-`docker-compose up`  OR `docker-compose up -d` for the _detached_ mode.
-
-### Stop Docker containers
-
-To stop Docker containers you can use the following command
-
-`docker-compose down`
-
-### Log in to Containers
-
-To log in to the container you can use one of the following commands
-
- - NGINX: `docker-compose exec web sh`
- 
- - PHP: `docker-compose exec php sh`
- 
- - APACHE: `docker-compose exec apache sh`
- 
- - MYSQL: `docker-compose exec db sh`
- 
- - NODEJS: `docker-compose exec nodejs sh`
- 
- - PHPMYADMIN: `docker-compose exec phpmyadmin sh`
+As a result, the application will be available at http://localhost/.
 
-### Troubleshooting
+### Stopping the Application
 
-- Docker can't run the container on the default port `80`: Please check if there is no other app which uses the same 
-port on your machine. You can also change the default port for `nginx` in the file `docker-compose.yml`.
-- Can't log in to `php` container: Please check all running Docker processes by using the following command 
-`docker-compose ps`. Check if you are using the correct name.
+To stop the application, run `make down`.

app/package-lock.json

@@ -0,0 +1,3 @@
+{
+  "license": "MIT"
+}

app/package.json

@@ -0,0 +1 @@
+FROM mysql:8.1.0

docker-compose.yml

@@ -0,0 +1,38 @@
+version: '3'
+
+services:
+  php:
+    build:
+      context: ./../../
+      dockerfile: ./etc/php/Dockerfile
+    image: docker-php-local
+
+  db:
+    build:
+      context: ./../../
+      dockerfile: ./etc/db/Dockerfile
+    image: docker-db-local
+
+  phpmyadmin:
+    build:
+      context: ./../../
+      dockerfile: ./etc/phpmyadmin/Dockerfile
+    image: docker-phpmyadmin-local
+
+  nodejs:
+    build:
+      context: ./../../
+      dockerfile: ./etc/nodejs/Dockerfile
+    image: docker-nodejs-local
+
+  apache:
+    build:
+      context: ./../../
+      dockerfile: ./etc/httpd/Dockerfile
+    image: docker-apache-local
+
+  nginx:
+    build:
+      context: ./../../
+      dockerfile: ./etc/nginx/Dockerfile
+    image: docker-nginx-local