From 28fe25c561f80005ae57d9197c2e6f521d5a5821 Mon Sep 17 00:00:00 2001 From: Vadim Abzalov Date: Mon, 22 Jun 2026 17:33:40 +0500 Subject: [PATCH 1/2] Add Moscow GIBDD region --- CHANGELOG.md | 6 ++++++ Dockerfile | 2 +- Makefile | 14 +++++++------- data/subject/codes.json | 3 ++- docker-compose.yml | 2 -- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcd5b94..dc6fb44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver]. +## Unreleased + +### Added + +- GIBDD region code for `Moscow region` - `977` + ## v3.21.0 ### Added diff --git a/Dockerfile b/Dockerfile index 4882e5d..1249daa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM php:8.0-alpine ENV COMPOSER_HOME="/tmp/composer" -COPY --from=composer:2.0.7 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2.9.8 /usr/bin/composer /usr/bin/composer RUN set -x \ && apk add --no-cache binutils git \ diff --git a/Makefile b/Makefile index 8ed1e49..13cf244 100644 --- a/Makefile +++ b/Makefile @@ -14,25 +14,25 @@ help: ## Show this help @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf " \033[32m%-14s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) build: ## Build docker images, required for current package environment - docker-compose build + docker compose build latest: clean ## Install latest php dependencies - docker-compose run $(RUN_APP_ARGS) app composer update -n --ansi --prefer-dist --prefer-stable + docker compose run $(RUN_APP_ARGS) app composer update -n --ansi --prefer-dist --prefer-stable install: clean ## Install regular php dependencies - docker-compose run $(RUN_APP_ARGS) app composer update -n --prefer-dist --no-interaction + docker compose run $(RUN_APP_ARGS) app composer update -n --prefer-dist --no-interaction lowest: clean ## Install lowest php dependencies - docker-compose run $(RUN_APP_ARGS) app composer update -n --ansi --prefer-dist --prefer-lowest + docker compose run $(RUN_APP_ARGS) app composer update -n --ansi --prefer-dist --prefer-lowest test: ## Execute php tests and linters - docker-compose run $(RUN_APP_ARGS) app composer test + docker compose run $(RUN_APP_ARGS) app composer test test-cover: ## Execute php tests with coverage - docker-compose run --rm --user "0:0" -e 'XDEBUG_MODE=coverage' app sh -c 'docker-php-ext-enable xdebug && su $(shell whoami) -s /bin/sh -c "composer phpunit-cover"' + docker compose run --rm --user "0:0" -e 'XDEBUG_MODE=coverage' app sh -c 'docker-php-ext-enable xdebug && su $(shell whoami) -s /bin/sh -c "composer phpunit-cover"' shell: ## Start shell into container with php - docker-compose run $(RUN_APP_ARGS) app sh + docker compose run $(RUN_APP_ARGS) app sh clean: ## Remove all dependencies and unimportant files -rm -Rf ./composer.lock ./vendor ./sdk/php/coverage diff --git a/data/subject/codes.json b/data/subject/codes.json index 047774f..8a5cfc5 100644 --- a/data/subject/codes.json +++ b/data/subject/codes.json @@ -684,7 +684,8 @@ 799, 777, 797, - 977 + 977, + 997 ], "code_iso_31662": "RU-MOW" }, diff --git a/docker-compose.yml b/docker-compose.yml index 1c5c7b0..82801b9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.2' - volumes: composer-data: From 54590eab71a0a05efa3cd4a01c5ce1bfc3f37404 Mon Sep 17 00:00:00 2001 From: Vadim Abzalov Date: Mon, 22 Jun 2026 18:00:37 +0500 Subject: [PATCH 2/2] wip --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1249daa..a51241f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM php:8.0-alpine ENV COMPOSER_HOME="/tmp/composer" -COPY --from=composer:2.9.8 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2.9.7 /usr/bin/composer /usr/bin/composer RUN set -x \ && apk add --no-cache binutils git \