New Docker config

.gitignore

@@ -29,13 +29,6 @@ phpunit.phar
 tests/_output/*
 tests/_support/_generated
 
-# local configs
-/config/key.php
-/config/db.php
-/config/authclients.php
-/config/rollbar.php
-/config/params-local.php
-
 # IDEs other settings
 .data
 

Makefile

@@ -0,0 +1,160 @@
+CLI_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
+$(eval $(sort $(subst :,\:,$(CLI_ARGS))):;@:)
+
+PRIMARY_GOAL := $(firstword $(MAKECMDGOALS))
+ifeq ($(PRIMARY_GOAL),)
+    PRIMARY_GOAL := help
+endif
+
+include docker/.env
+
+# Current user ID and group ID except MacOS where it conflicts with Docker abilities
+ifeq ($(shell uname), Darwin)
+    export UID=1000
+    export GID=1000
+else
+    export UID=$(shell id -u)
+    export GID=$(shell id -g)
+endif
+
+export COMPOSE_PROJECT_NAME=${STACK_NAME}
+DOCKER_COMPOSE_DEV := docker compose -f docker/compose.yml -f docker/dev/compose.yml
+DOCKER_COMPOSE_TEST := docker compose -f docker/compose.yml -f docker/test/compose.yml
+
+#
+# Development
+#
+
+ifeq ($(PRIMARY_GOAL),build)
+build: ## Build docker images.
+	$(DOCKER_COMPOSE_DEV) build $(CLI_ARGS)
+endif
+
+ifeq ($(PRIMARY_GOAL),up)
+up: ## Up the dev environment.
+	$(DOCKER_COMPOSE_DEV) up -d --remove-orphans
+endif
+
+ifeq ($(PRIMARY_GOAL),down)
+down: ## Down the dev environment.
+	$(DOCKER_COMPOSE_DEV) down --remove-orphans
+endif
+
+ifeq ($(PRIMARY_GOAL),stop)
+stop: ## Stop the dev environment.
+	$(DOCKER_COMPOSE_DEV) stop
+endif
+
+ifeq ($(PRIMARY_GOAL),clear)
+clear: ## Remove development docker containers and volumes.
+	$(DOCKER_COMPOSE_DEV) down --volumes --remove-orphans
+endif
+
+ifeq ($(PRIMARY_GOAL),shell)
+shell: ## Get into container shell.
+	$(DOCKER_COMPOSE_DEV) exec app /bin/bash
+endif
+
+#
+# Tools
+#
+
+ifeq ($(PRIMARY_GOAL),yii)
+yii: ## Execute Yii command.
+	$(DOCKER_COMPOSE_DEV) run --rm app ./yii $(CLI_ARGS)
+.PHONY: yii
+endif
+
+ifeq ($(PRIMARY_GOAL),composer)
+composer: ## Run Composer.
+	$(DOCKER_COMPOSE_DEV) run --rm app composer $(CLI_ARGS)
+endif
+
+ifeq ($(PRIMARY_GOAL),rector)
+rector: ## Run Rector.
+	$(DOCKER_COMPOSE_DEV) run --rm app ./vendor/bin/rector $(CLI_ARGS)
+endif
+
+ifeq ($(PRIMARY_GOAL),cs-fix)
+cs-fix: ## Run PHP CS Fixer.
+	$(DOCKER_COMPOSE_DEV) run --rm app ./vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff
+endif
+
+#
+# Tests and analysis
+#
+
+ifeq ($(PRIMARY_GOAL),test)
+test: ## Run tests.
+	$(DOCKER_COMPOSE_TEST) run --rm app ./vendor/bin/codecept run $(CLI_ARGS)
+endif
+
+ifeq ($(PRIMARY_GOAL),test-coverage)
+test-coverage: ## Run tests with coverage.
+	$(DOCKER_COMPOSE_TEST) run --rm app ./vendor/bin/codecept run --coverage --coverage-html --disable-coverage-php
+endif
+
+ifeq ($(PRIMARY_GOAL),codecept)
+codecept: ## Run Codeception.
+	$(DOCKER_COMPOSE_TEST) run --rm app ./vendor/bin/codecept $(CLI_ARGS)
+endif
+
+ifeq ($(PRIMARY_GOAL),psalm)
+psalm: ## Run Psalm.
+	$(DOCKER_COMPOSE_DEV) run --rm app ./vendor/bin/psalm $(CLI_ARGS)
+endif
+
+ifeq ($(PRIMARY_GOAL),composer-dependency-analyser)
+composer-dependency-analyser: ## Run Composer Dependency Analyser.
+	$(DOCKER_COMPOSE_DEV) run --rm app ./vendor/bin/composer-dependency-analyser --config=composer-dependency-analyser.php $(CLI_ARGS)
+endif
+
+#
+# Production
+#
+
+ifeq ($(PRIMARY_GOAL),prod-build)
+prod-build: ## Build an image.
+	docker build --file docker/Dockerfile --target prod --pull -t ${IMAGE}:${IMAGE_TAG} .
+endif
+
+ifeq ($(PRIMARY_GOAL),prod-push)
+prod-push: ## Push image to repository.
+	docker push ${IMAGE}:${IMAGE_TAG}
+endif
+
+ifeq ($(PRIMARY_GOAL),prod-deploy)
+prod-deploy: ## Deploy to production.
+	set -euo pipefail \
+	docker -H ${PROD_SSH} stack deploy --prune --detach=false --with-registry-auth -c docker/compose.yml -c docker/prod/compose.yml ${STACK_NAME} 2>&1 | tee deploy.log \
+	if grep -qiE 'rollback:|update rolled back' deploy.log then \
+		FAILED_TASK_ID="$(grep -oiE 'task[[:space:]]+[a-z0-9]+' deploy.log | head -n 1 | awk '{print $2}')" \
+		if [ -n "${FAILED_TASK_ID}" ]; then \
+			echo "Docker Swarm update rolled back; failing job. Failed task ID: ${FAILED_TASK_ID}" \
+			echo "--- docker service logs (${FAILED_TASK_ID}) ---" \
+			docker -H ${PROD_SSH} service logs --timestamps --tail 500 "${FAILED_TASK_ID}" || true \
+		else \
+			echo 'Docker Swarm update rolled back; failing job. Failed task ID: not found in deploy output.' \
+		fi \
+		exit 1 \
+	fi
+endif
+
+#
+# Other
+#
+
+ifeq ($(PRIMARY_GOAL),help)
+help: ## This help.
+	@awk 'BEGIN { printf "\nUsage:\n  make \033[36m<target>\033[0m\n" } \
+	/^#$$/ { blank = 1; next } \
+	blank && /^# [a-zA-Z]/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 3); blank = 0; next } \
+	/^[a-zA-Z_-]+:([^=]|$$)/ { \
+		split($$0, parts, "##"); \
+		target = parts[1]; sub(/:.*/, "", target); \
+		desc = parts[2]; \
+		gsub(/^[[:space:]]+|[[:space:]]+$$/, "", desc); \
+		printf "  \033[36m%-25s\033[0m %s\n", target, desc; \
+		blank = 0; \
+	}' $(MAKEFILE_LIST)
+endif

composer.json

@@ -7,7 +7,7 @@
     "license": "BSD-3-Clause",
     "minimum-stability": "stable",
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=8.4.0",
         "yiisoft/yii2": "~2.0.35",
         "yiisoft/yii2-bootstrap": "~2.0.6",
         "yiisoft/yii2-swiftmailer": "~2.0.6",
@@ -25,8 +25,7 @@
         "bower-asset/font-awesome": "~4.7.0.0",
         "claviska/simpleimage": "^3.3",
         "abraham/twitteroauth": "^2.0.2",
-        "yiisoft/yii2-queue": "~2.3.3",
-        "vlucas/phpdotenv": "^5.6"
+        "yiisoft/yii2-queue": "~2.3.3"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.1.13",
@@ -41,25 +40,6 @@
             "block-insecure": false
         }
     },
-    "scripts": {
-        "post-create-project-cmd": [
-            "yii\\composer\\Installer::postCreateProject"
-        ]
-    },
-    "extra": {
-        "yii\\composer\\Installer::postCreateProject": {
-            "setPermission": [
-                {
-                    "runtime": "0777",
-                    "web/assets": "0777",
-                    "yii": "0755"
-                }
-            ],
-            "generateCookieValidationKey": [
-                "config/web.php"
-            ]
-        }
-    },
     "repositories": [
     {
         "type": "composer",