diff --git a/config/version.php b/config/version.php index 1a4b5ee2ac..9d0b165893 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v8.1.5', - 'full_app_version' => 'v8.1.5 - build 18388-g64aeaeeee', - 'build_version' => '18388', + 'app_version' => 'v8.1.15', + 'full_app_version' => 'v8.1.15 - build 18405-ge4314cf42', + 'build_version' => '18405', 'prerelease_version' => '', - 'hash_version' => 'g64aeaeeee', - 'full_hash' => 'v8.1.5-141-g64aeaeeee', - 'branch' => 'master', + 'hash_version' => 'ge4314cf42', + 'full_hash' => 'v8.1.15-13-ge4314cf42', + 'branch' => 'develop', ); \ No newline at end of file diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml index 6cf4a1e2f2..0cd8139c0e 100644 --- a/dev.docker-compose.yml +++ b/dev.docker-compose.yml @@ -21,7 +21,7 @@ services: - .env.dev.docker mariadb: - image: mariadb:11.5.2 + image: mariadb:11.4.7 volumes: - db:/var/lib/mysql env_file: @@ -36,7 +36,7 @@ services: retries: 5 redis: - image: redis:7.4.0 + image: redis:7.4.3 mailhog: image: mailhog/mailhog:v1.0.1 diff --git a/docker-compose.yml b/docker-compose.yml index d5e9b3ae89..d874d2e008 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: - .env db: - image: mariadb:11.5.2 + image: mariadb:11.4.7 restart: unless-stopped volumes: - db_data:/var/lib/mysql