Rebuild and big update

Author: Evgenii Mykhalichenko

.env_example

@@ -1,10 +1,30 @@
 # Docker
 DOCKER_PREFIX=skeleton
+DOCKER_WORK_DIR=/var/www/backend
+
+# Nginx
+NGINX_VERSION=latest
+NGINX_PORT=80
+NGINX_HOST=localhost
+
+# Redis
+REDIS_VERSION=latest
+REDIS_PORT=6379
+
+# Redis commander
+REDIS_COMMANDER_VERSION=latest
+REDIS_COMMANDER_PORT=8081
+
+# xDebug
+XDEBUG_MODE=debug,trace
+XDEBUG_CLIENT_HOST=host.docker.internal
+XDEBUG_IDKEY=docker
+XDEBUG_CLIENT_PORT=9003
 
 # MySQL
-MYSQL_HOST=
-MYSQL_PORT=
-MYSQL_DATABASE=testwork
+MYSQL_VERSION=latest
+MYSQL_PORT=3306
+MYSQL_DATABASE=skeleton_db
 MYSQL_ROOT_USER=
 MYSQL_ROOT_PASSWORD=
 MYSQL_USER=

.gitignore

@@ -1,5 +1,8 @@
 .env
 
+# Ignore mysql data
+/docker/mysql/data/**
+
 # Editor directories and files
 .idea
 *.suo

Makefile

@@ -1,4 +1,12 @@
-include .env
+#!make
+-include .env
+
+# set default command name
+default: help
+
+# set variables
+DOCKER := docker
+DOCKER_COMPOSE := docker-compose
 
 # make help
 help:
@@ -14,7 +22,38 @@ help:
 
 # make init
 init:
-cp .env_example .env;
+@if [ ! -f ./.env ]; then \
+cp .env_example .env; \
+fi
+
+# add nginx host to /etc/hosts file
+add-host:
+SERVICES=$$(command -v getent > /dev/null && echo "getent ahostsv4" || echo "dscacheutil -q host -a name"); \
+if [ ! "$$($$SERVICES $(NGINX_HOST) | grep 127.0.0.1 > /dev/null; echo $$?)" -eq 0 ]; then sudo bash -c 'echo "127.0.0.1 $(NGINX_HOST)" >> /etc/hosts; echo "Entry was added"'; else echo 'Entry already exists'; fi;
+
+# exec docker backend container
+bash:
+@${DOCKER} exec -it "${DOCKER_PREFIX}-backend" bash;
+
+# build docker-compose
+build:
+@${DOCKER_COMPOSE} build;
+
+# build docker-compose without cache
+build-no-cache:
+@${DOCKER_COMPOSE} build --no-cache;
+
+# up with demon docker containers
+up:
+@${DOCKER_COMPOSE} up -d;
+
+# down docker containers
+down:
+@${DOCKER_COMPOSE} up --volumes --rmi local --remove-orphans;
+
+# stop docker containers
+stop:
+@${DOCKER_COMPOSE} stop;
 
 # make clear-all-logs
 clear-all-logs:

docker-compose.yml

@@ -3,38 +3,44 @@ version: "3.7"
 services:
 
  nginx:
- image: nginx:latest
+ image: "nginx:${NGINX_VERSION}"
  container_name: "${DOCKER_PREFIX}-nginx"
+ restart: always
  ports:
- - "80:80"
+ - "${NGINX_PORT}:80"
  volumes:
- - ./docker/nginx/nginx.conf:/etc/nginx/conf.d/nginx.conf
- - ./src:/var/www/backend
+ - ./docker/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
+ - ./docker/nginx/default.template.conf:/etc/nginx/default.template
+ - "./src:${DOCKER_WORK_DIR}"
  - ./logs/nginx/:/var/log/nginx/
+ environment:
+ - NGINX_HOST=${NGINX_HOST}
+ command: /bin/sh -c "envsubst '$$NGINX_HOST' < /etc/nginx/default.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
  networks:
  - backend-network
 
  redis:
- image: redis:latest
+ image: "redis:${REDIS_VERSION}"
+ restart: always
  container_name: "${DOCKER_PREFIX}-redis"
- expose:
- - "6379"
+ ports:
+ - "${REDIS_PORT}:6379"
  networks:
  - backend-network
 
  redis-commander:
- image: rediscommander/redis-commander:latest
+ image: "rediscommander/redis-commander:${REDIS_COMMANDER_VERSION}"
  container_name: "${DOCKER_PREFIX}-redis-commander"
  restart: always
  environment:
  - REDIS_HOSTS=local:redis
  ports:
- - "8081:8081"
+ - "${REDIS_COMMANDER_PORT}:8081"
  networks:
  - backend-network
 
  mysql:
- image: mysql:latest
+ image: "mysql:${MYSQL_VERSION}"
  container_name: "${DOCKER_PREFIX}-mysql"
  restart: always
  env_file:
@@ -45,22 +51,31 @@ services:
  - MYSQL_USER=${MYSQL_USER}
  - MYSQL_PASSWORD=${MYSQL_PASSWORD}
  volumes:
+ - ./docker/mysql/data:/var/lib/mysql
  - ./logs/mysql/:/var/log/mysql
  - ./docker/mysql/conf.d:/etc/mysql/conf.d
  ports:
- - "3306:3306"
+ - "${MYSQL_PORT}:3306"
  networks:
  - backend-network
 
  backend:
  container_name: "${DOCKER_PREFIX}-backend"
- build: docker/backend
+ build:
+ context: ./docker/backend
+ dockerfile: Dockerfile
+ args:
+ - WORK_DIR=${DOCKER_WORK_DIR}
+ - XDEBUG_MODE=${XDEBUG_MODE}
+ - XDEBUG_CLIENT_HOST=${XDEBUG_CLIENT_HOST}
+ - XDEBUG_IDKEY=${XDEBUG_IDKEY}
+ - XDEBUG_CLIENT_PORT=${XDEBUG_CLIENT_PORT}
+ restart: always
  env_file:
  - .env
  volumes:
- - ./src:/var/www/backend
+ - "./src:${DOCKER_WORK_DIR}"
  - ./logs/supervisor/:/var/log/supervisor/
- - ./logs/cron/:/var/log/cron/
  ports:
  - "9001:9001" # Access GUI with http://localhost:9001/
  networks:

docker/backend/Dockerfile

@@ -1,5 +1,17 @@
 FROM php:8.1-fpm
 
+ARG WORK_DIR
+ARG XDEBUG_MODE
+ARG XDEBUG_CLIENT_HOST
+ARG XDEBUG_IDKEY
+ARG XDEBUG_CLIENT_PORT
+
+ENV WORK_DIR=$WORK_DIR
+ENV XDEBUG_MODE=$XDEBUG_MODE
+ENV XDEBUG_CLIENT_HOST=$XDEBUG_CLIENT_HOST
+ENV XDEBUG_IDKEY=$XDEBUG_IDKEY
+ENV XDEBUG_CLIENT_PORT=$XDEBUG_CLIENT_PORT
+
 # Set timezone
 RUN echo "UTC" > /etc/timezone
 
@@ -10,7 +22,6 @@ RUN apt-get update && apt-get install -y \
  unzip \
  curl \
  supervisor \
- cron \
  procps \
  htop
 
@@ -23,11 +34,10 @@ COPY php/conf.d/xdebug.ini $PHP_INI_DIR/conf.d/
 COPY supervisor/supervisord.conf /etc/supervisor
 COPY supervisor/conf.d/* /etc/supervisor/conf.d
 
-COPY cron/crontab /etc/cron.d/crontab
-RUN chmod 0644 /etc/cron.d/crontab
-RUN crontab /etc/cron.d/crontab
-
-RUN mkdir -p /var/log/cron
+# Set configuration for xdebug
+RUN sed -i -e 's/xdebug.client_host=host.docker.internal/xdebug.client_host='"${XDEBUG_CLIENT_HOST}"'/g' $PHP_INI_DIR/conf.d/xdebug.ini
+RUN sed -i -e 's/xdebug.client_port=9003/xdebug.client_port='"${XDEBUG_CLIENT_PORT}"'/g' $PHP_INI_DIR/conf.d/xdebug.ini
+RUN sed -i -e 's/xdebug.idekey=docker/xdebug.idekey='"${XDEBUG_IDKEY}"'/g' $PHP_INI_DIR/conf.d/xdebug.ini
 
 # Install and enable pecl php extentions
 RUN pecl install xdebug redis
@@ -39,6 +49,6 @@ RUN docker-php-ext-install pdo_mysql
 # Get latest Composer
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
-WORKDIR "/var/www/backend"
+WORKDIR "${WORK_DIR}"
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

docker/backend/cron/crontab

@@ -1,7 +1,10 @@
 server {
  listen 80 default_server;
+ listen [::]:80 default_server;
  root /var/www/backend/public;
 
+ server_name api.loc;
+
  index index.php;
 
  error_log /var/log/nginx/backend-error.log;

docker/nginx/nginx.conf renamed to docker/nginx/conf.d/default.conf

@@ -0,0 +1,22 @@
+server {
+ listen 80 default_server;
+ listen [::]:80 default_server;
+ root /var/www/backend/public;
+
+ server_name ${NGINX_HOST};
+
+ index index.php;
+
+ error_log /var/log/nginx/backend-error.log;
+ access_log /var/log/nginx/backend-access.log;
+
+ location / {
+ try_files $uri $uri/ /index.php?$query_string;
+ }
+
+ location ~ \.php$ {
+ fastcgi_pass backend:9000;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ include fastcgi_params;
+ }
+}

docker/nginx/default.template.conf

@@ -1,2 +1,3 @@
 *
+*/
 !.gitignore