Rework makefile commands, instruction, add correct nginx config, add index.php file in the public dir, remove node Dockerfile

Author: renakdup

.env.dist

@@ -12,35 +12,46 @@ NGINX_SITE_DOMAIN=wp-docker-boilerplate.local
 
 
 #############################
-# Common
+# PHP
 #############################
-HH_SITE_DOMAIN=${NGINX_SITE_DOMAIN}:${NGINX_PORT}
+PHP_VER=7.4
 
 
 #############################
 # MySQL settings
 #############################
 MYSQL_PORT=3307
-MYSQL_DATABASE=charity_local
+MYSQL_DATABASE=wordpress
 MYSQL_USER=admin
-MYSQL_PASSWORD=lKJH5jkjg234ds
-MYSQL_ROOT_PASSWORD=lKJH5jkjg234ds
+MYSQL_PASSWORD=12345
+MYSQL_ROOT_PASSWORD=12345
 MYSQL_TZ=Europe/Moscow
 
-
 #############################
 # PhpMyAdmin settings
 #############################
 PMA_PORT=8082
 
 
+#############################
+# NODE
+#############################
+NODE_VER="16.14.2"
+
+
+#############################
+# Common
+#############################
+SITE_DOMAIN=${NGINX_SITE_DOMAIN}:${NGINX_PORT}
+
+
 #############################
 # WordPress config settings
 #############################
-HH_INSTALL_ADMIN_TITLE="Wordpress docker boilerplate"
-HH_INSTALL_ADMIN_LOGIN=admin
-HH_INSTALL_ADMIN_PASSWORD=12345
-HH_INSTALL_ADMIN_EMAIL=admin@${NGINX_SITE_DOMAIN}
+INSTALL_ADMIN_TITLE="WordPress Docker Boilerplate Site"
+INSTALL_ADMIN_LOGIN=admin
+INSTALL_ADMIN_PASSWORD=
+INSTALL_ADMIN_EMAIL=admin@${NGINX_SITE_DOMAIN}
 
 WP_CORE_VERSION=5.7.1
 WP_CORE_LOCALE=en_US

.gitignore

@@ -2,6 +2,7 @@
 # Configuration files
 ##################################
 .env
+docker-compose.override.yaml
 docker/mysql/backup/*
 !docker/mysql/backup/.gitkeep
 vendor/
@@ -11,9 +12,8 @@ node_modules/
 
 # Project public files
 ##################################
-!/public/index.php
-
 public/*
+!/public/index.php
 !public/wp-content
 public/wp-content/*
 

Makefile

@@ -1,94 +1,135 @@
 include .env
 export
 
-UID = $(shell id -u)
-GUID = $(shell id -g)
-
-# Build
-build: d.up
-	@$(MAKE) c.install
-	@$(MAKE) wp.core.download
+#UID = $(shell id -u)
+#GUID = $(shell id -g)
 
+##########################
 # Docker
-d.ps:
-	docker ps
+##########################
+d:
+	docker $(filter-out $@,$(MAKECMDGOALS))
 
 d.up:
 	docker-compose up -d
 
+d.ps:
+	docker ps
+
 d.restart: d.down
 	@$(MAKE) up
 
 d.down:
 	docker-compose down --remove-orphans
 
-d.build-image:
-	docker-compose up -d --no-deps --build $(filter-out $@,$(MAKECMDGOALS))
+d.compose:
+	docker-compose $(filter-out $@,$(MAKECMDGOALS))
 
-d.build-all-images:
-	docker-compose up -d --no-deps --build
+d.build:
+	docker-compose up --no-deps -d --build $(filter-out $@,$(MAKECMDGOALS))
 
-d.recreate-container:
-	docker-compose up -d --force-recreate $(filter-out $@,$(MAKECMDGOALS))
+d.build.all:
+	docker-compose up -d --build
 
-d.recreate-all-containers:
-	docker-compose up -d --force-recreate
+d.recreate:
+	docker-compose up --no-deps -d --build $(filter-out $@,$(MAKECMDGOALS))
 
-d.bash:
-	docker-compose exec $(filter-out $@,$(MAKECMDGOALS)) bash
+d.recreate.all:
+	docker-compose up -d --force-recreate
 
 d.test:
 	docker run hello-world
 
+##########################
+# Nginx
+##########################
+nginx.connect:
+	docker-compose exec nginx sh
+
 
-connect.php:
+##########################
+# PHP
+##########################
+php.connect:
 	docker-compose exec php bash
 
+php.connect.root:
+	docker-compose exec --user=root php bash
 
+
+##########################
 # MySQL
+##########################
+mysql.connect:
+	docker-compose exec mysql bash
+	#docker-compose exec mysql mysql -uroot -p${MYSQL_ROOT_PASSWORD} ${MYSQL_DATABASE}
+
+mysql.client.connect:
+	docker-compose exec mysql sh -c 'echo "Import db" && mysql -u${DB_USER} -p${DB_PASSWORD}'
+
 mysql.export:
 	docker-compose exec mysql bash -c "mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} ${MYSQL_DATABASE} > backup-`date +"\%Y.\%m.\%d_\%H-\%M-\%s"`.sql \
 	&& chown -R ${UID}:${GUID} ./*"
 
 mysql.import:
 	docker-compose exec mysql mysql -uroot -p${MYSQL_ROOT_PASSWORD} ${MYSQL_DATABASE} < import_db.sql
 
-mysql.connect:
-	docker-compose exec mysql mysql -uroot -p${MYSQL_ROOT_PASSWORD} ${MYSQL_DATABASE}
 
 
+
+##########################
 # Composer
-c:
-	docker-compose exec php composer $(filter-out $@,$(MAKECMDGOALS))
+##########################
+# Root directory
+composer:
+	cd ${PATH_TO_DOCKER} && docker-compose exec php composer $(filter-out $@,$(MAKECMDGOALS))
 
-c.install:
+composer.install:
 	docker-compose exec php composer install $(filter-out $@,$(MAKECMDGOALS))
 
-c.install-production:
-	docker-compose exec php composer install --no-dev
-
-c.update:
+composer.update:
 	docker-compose exec php composer update $(filter-out $@,$(MAKECMDGOALS))
 
-c.update-production:
-	docker-compose exec php composer update --no-dev
 
+##########################
+# Node
+##########################
+node.connect:
+	docker run -it --rm --name=npm  -v "$(PWD)/:/usr/src/app" -w="/usr/src/app/" "node:${NODE_VER}" bash
 
-# Front
-npm.install:
-	docker-compose run --rm node npm install
+node.install:
+	docker run -it --rm --name=npm  -v "$(PWD)/:/usr/src/app" -w="/usr/src/app/" "node:${NODE_VER}" npm install
 
-npm.ci:
-	docker-compose run --rm node npm ci
+node.ci:
+	docker run -it --rm --name=npm  -v "$(PWD)/:/usr/src/app" -w="/usr/src/app/" "node:${NODE_VER}" npm ci
 
-npm.update:
-	docker-compose run --rm node npm update
+node.update:
+	docker run -it --rm --name=npm  -v "$(PWD)/:/usr/src/app" -w="/usr/src/app/" "node:${NODE_VER}" npm update
 
 npm.webpack-start:
-	docker-compose run --rm node npm start
+	docker run -it --rm --name=npm  -v "$(PWD)/:/usr/src/app" -w="/usr/src/app/" "node:${NODE_VER}" node npm start
 
 
+##########################
+# Linters
+##########################
+#lint.php:
+#	docker-compose exec php sh -c 'composer run phpcs'
+#
+#lint.php.fix:
+#	docker-compose exec php sh -c 'composer run phpcbf'
+
+
+##########################
+# Tests
+##########################
+#unit.run:
+#	docker-compose exec php sh -c 'phpunit --do-not-cache-result'
+
+
+##########################
 # WP-CLI
+##########################
 wp:
 	docker-compose exec php wp --allow-root $(filter-out $@,$(MAKECMDGOALS))
 
@@ -99,8 +140,12 @@ wp.core.download:
 	docker-compose exec php wp core download --force --version=${WP_CORE_VERSION} --locale=${WP_CORE_LOCALE}
 
 wp.core.install:
-	docker-compose exec php wp core install --url=${HH_SITE_DOMAIN} --title=${HH_INSTALL_ADMIN_TITLE} --admin_user=${HH_INSTALL_ADMIN_LOGIN} --admin_email=${HH_INSTALL_ADMIN_EMAIL} --admin_password=${HH_INSTALL_ADMIN_PASSWORD}
+	docker-compose exec php wp core install --url=${SITE_DOMAIN} --title=${HH_INSTALL_ADMIN_TITLE} --admin_user=${INSTALL_ADMIN_LOGIN} --admin_email=${INSTALL_ADMIN_EMAIL} --admin_password=${INSTALL_ADMIN_PASSWORD}
+
 
+##########################
+# Commands helpers
+##########################
 # It is used for fixing access right errors for files on OS-side, has created on docker-side.
 fix-access-right-for:
 	sudo chown -R $(USER):$(shell  id -g -n) $(filter-out $@,$(MAKECMDGOALS))

Readme.md renamed to README.md

@@ -1,21 +1,20 @@
 # Docker Environment Boilerplate for WordPress
 
 ### Docker configuration:
-- Nginx 1.19
+- Nginx 1.20
 - PHP 7.4
 - Composer > 2.1  
 - MySQL 5.6
 - PhpMyAdmin 5
-- Node 15
+- Node 16.14.2
 - WP-CLI > 2.5.0
 
 ## Instructions
 1. You need to add the string to `hosts` file your OS:  
 `127.0.0.1 	wp-docker-boilerplate.local`
-```bash
-    # create env file
-    docker/sh/create.env.sh
-    # !!! You must fill variables in .env file.
+```bash 
+    # copy & paste and fill variables
+    cp .env.dist .env
 
     # run docker project.
     make d.up
@@ -44,17 +43,16 @@ or
 If you want change domain, you need to change `server_name` in `./docker/nginxconf.d/default.conf`.
 
 
-##  If you have troubles with VPN
-1. If you use VPN, you need to disable VPN and run command:  
-`docker network create localdev`
-2. After It you can run your VPN.
-3. Add the code at end of the file:
-   ```networks:
-    default:
-     external:
-      name: localdev
-3. Make to  
- `docker-compose up -d`
- 
+###  Q/A  
+If you get next error on MacOS  
+```failed to solve with frontend dockerfile.v0: failed to create LLB definition: no match for platform in manifest sha256:20575ecebe6216036d25dab5903808211f1e9ba63dc7825ac20cb975e34cfcae: not found```
+
+create `docker-compose.override.yml` in the project and add following lines:
+```
+services:
+  mysql:
+    platform: linux/amd64
+    image: mysql:5.6 #or any other version
+``` 
 
 

composer.json

@@ -1,16 +1,13 @@
 {
     "name": "renakdup/wp-docker-boilerplate",
-    "description": "Docker Environment Example",
+    "description": "Docker Boilerplate Environment for WordPress",
     "authors": [
         {
-            "name": "Andrew Pisarevsky",
+            "name": "Andrei Pisarevskii",
             "email": "[email protected]"
         }
     ],
     "require": {
         "vlucas/phpdotenv": "^5.3"
-    },
-    "scripts": {
-        "wp-install": "wp core download"
     }
 }

docker-compose.yaml

@@ -15,6 +15,8 @@ services:
       - ./docker/nginx/templates:/etc/nginx/templates
     depends_on:
       - php
+    networks:
+      - rd-network
 
   php:
     restart: always
@@ -23,8 +25,11 @@ services:
       args:
         UID: $UID
         GUID: $GUID
+        PHP_VER: $PHP_VER
     volumes:
       - ./:/app
+    networks:
+      - rd-network
 
   mysql:
     restart: always
@@ -44,6 +49,8 @@ services:
       - ./docker/mysql/backup/:/backup
     ports:
       - $MYSQL_PORT:3307
+    networks:
+      - rd-network
 
   phpmyadmin:
     restart: always
@@ -56,16 +63,13 @@ services:
       PMA_PASSWORD: $MYSQL_PASSWORD
     depends_on:
       - mysql
-
-# You need to define the "npm start" command in the package.json file in the "./ directory", or comment out
-# the string "npm start" in the Dockerfile.
-#  node:
-#    build: ./docker/node
-#    ports:
-#      - "3000:3000"
-#    volumes_from:
-#      - php
-
+    networks:
+      - rd-network
 
 volumes:
   mysql-data:
+
+
+networks:
+  rd-network:
+    driver: bridge