Commit 67e089c2 authored by Tobias Munk's avatar Tobias Munk

fixed asset building, fixed config loader for common-debug, use debug in all app-types (if enabled)

parent 2f216935
Pipeline #76829 passed with stage
in 10 minutes and 9 seconds
......@@ -54,7 +54,7 @@ VOLUME /app/runtime /app/web/assets /mnt/storage
# Build assets (skipped on first build in dist-upgrade)
RUN if [ -z "$BUILD_NO_INSTALL" ]; then \
APP_NO_CACHE=1 APP_LANGUAGES=en APP_USER_FROM_EMAIL=build@Dockerfile APP_ADMIN_EMAIL=build@Dockerfile yii asset/compress config/assets.php web/bundles/config.php; \
PHP_USER_ID=0 APP_NO_CACHE=1 APP_LANGUAGES=en APP_USER_FROM_EMAIL=build@Dockerfile APP_ADMIN_EMAIL=build@Dockerfile yii asset/compress config/assets.php web/bundles/config.php; \
fi
# Install crontab from application config
......
......@@ -102,13 +102,20 @@ if (getenv('MYSQL_ATTR_SSL_CA')) {
// update Redis increment counter according to queue_manager db (workaround)
Event::on(Queue::class, Queue::EVENT_BEFORE_PUSH, function ($event) {
// added directly to the SQL query, since param binding
$table_name = getenv('DATABASE_TABLE_PREFIX').'queue_manager';
if (Yii::$app->cache->get('queue_id_synced') !== true) {
$lastQueueIdSql = <<<SQL
SELECT `AUTO_INCREMENT`
FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '{table_prefix}queue_manager'
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '{$table_name}'
SQL;
$lastModelId = Yii::$app->db->createCommand($lastQueueIdSql, ['{table_prefix}'=>getenv('DATABASE_TABLE_PREFIX')])->queryScalar();
$lastModelId = Yii::$app->db
->createCommand($lastQueueIdSql)
->queryScalar();
if (!is_int($lastModelId)) {
throw new \yii\db\Exception("Invalid increment ({$lastModelId}) for Redis queue");
}
Yii::$app->redis->set("queue.message_id", $lastModelId);
Yii::$app->cache->set('queue_id_synced', true);
Yii::info("Synced redis queue id with database ($lastModelId)");
......
......@@ -41,6 +41,7 @@ return call_user_func(function () {
"{$configDir}/".APP_TYPE.'.php' => true,
"{$configDir}/common-".YII_ENV.'.php' => false,
"{$configDir}/".APP_TYPE.'-'.YII_ENV.'.php' => false,
"{$configDir}/common-".((YII_DEBUG)?'debug':'release').'.php' => false,
"{$configDir}/".APP_TYPE.'-'.((YII_DEBUG)?'debug':'release').'.php' => false,
];
......@@ -55,7 +56,6 @@ return call_user_func(function () {
// Merge configurations
$config = [];
//var_dump($configFiles);exit;
Yii::trace($configFiles, __METHOD__);
foreach ($configFiles as $file => $isRequired) {
if (!is_file($file)) {
......
......@@ -578,7 +578,7 @@
"version": "3.6.4",
"source": {
"type": "git",
"url": "git@github.com:jquery/jquery-dist.git",
"url": "https://github.com/jquery/jquery-dist.git",
"reference": "91ef2d8836342875f2519b5815197ea0f23613cf"
},
"dist": {
......@@ -719,12 +719,12 @@
"version": "v1.3.2",
"source": {
"type": "git",
"url": "git@github.com:bestiejs/punycode.js.git",
"url": "https://github.com/mathiasbynens/punycode.js.git",
"reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bestiejs/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3",
"url": "https://api.github.com/repos/mathiasbynens/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3",
"reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3"
},
"type": "bower-asset"
......@@ -2104,16 +2104,16 @@
},
{
"name": "dmstr/yii2-publication-module",
"version": "1.2.4",
"version": "1.2.5",
"source": {
"type": "git",
"url": "https://github.com/dmstr/yii2-publication-module.git",
"reference": "849dde35be9aee70ca617eedd1a2978a832d29e5"
"reference": "93a677ef0990152cbb202b14c38b5b5858979c85"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dmstr/yii2-publication-module/zipball/849dde35be9aee70ca617eedd1a2978a832d29e5",
"reference": "849dde35be9aee70ca617eedd1a2978a832d29e5",
"url": "https://api.github.com/repos/dmstr/yii2-publication-module/zipball/93a677ef0990152cbb202b14c38b5b5858979c85",
"reference": "93a677ef0990152cbb202b14c38b5b5858979c85",
"shasum": ""
},
"require": {
......@@ -2149,9 +2149,9 @@
],
"support": {
"issues": "https://github.com/dmstr/yii2-publication-module/issues",
"source": "https://github.com/dmstr/yii2-publication-module/tree/1.2.4"
"source": "https://github.com/dmstr/yii2-publication-module/tree/1.2.5"
},
"time": "2023-03-14T09:51:11+00:00"
"time": "2023-04-18T09:36:52+00:00"
},
{
"name": "dmstr/yii2-redirect-module",
......@@ -2357,16 +2357,16 @@
},
{
"name": "dmstr/yii2-willnorris-imageproxy",
"version": "1.1.1",
"version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/dmstr/yii2-willnorris-imageproxy.git",
"reference": "c2de268ba38c6808860f9520bb022b13de3501fa"
"reference": "bdfa37e3e40b6fd20bfd6b49c810cbe11d29ca24"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dmstr/yii2-willnorris-imageproxy/zipball/c2de268ba38c6808860f9520bb022b13de3501fa",
"reference": "c2de268ba38c6808860f9520bb022b13de3501fa",
"url": "https://api.github.com/repos/dmstr/yii2-willnorris-imageproxy/zipball/bdfa37e3e40b6fd20bfd6b49c810cbe11d29ca24",
"reference": "bdfa37e3e40b6fd20bfd6b49c810cbe11d29ca24",
"shasum": ""
},
"require": {
......@@ -2398,9 +2398,9 @@
],
"support": {
"issues": "https://github.com/dmstr/yii2-willnorris-imageproxy/issues",
"source": "https://github.com/dmstr/yii2-willnorris-imageproxy/tree/1.1.1"
"source": "https://github.com/dmstr/yii2-willnorris-imageproxy/tree/io"
},
"time": "2022-12-07T11:20:42+00:00"
"time": "2023-04-06T14:23:26+00:00"
},
{
"name": "doctrine/lexer",
......@@ -4098,16 +4098,16 @@
},
{
"name": "mikehaertl/php-shellcommand",
"version": "1.6.4",
"version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/mikehaertl/php-shellcommand.git",
"reference": "3488d7803df1e8f1a343d3d0ca452d527ad8d5e5"
"reference": "e79ea528be155ffdec6f3bf1a4a46307bb49e545"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mikehaertl/php-shellcommand/zipball/3488d7803df1e8f1a343d3d0ca452d527ad8d5e5",
"reference": "3488d7803df1e8f1a343d3d0ca452d527ad8d5e5",
"url": "https://api.github.com/repos/mikehaertl/php-shellcommand/zipball/e79ea528be155ffdec6f3bf1a4a46307bb49e545",
"reference": "e79ea528be155ffdec6f3bf1a4a46307bb49e545",
"shasum": ""
},
"require": {
......@@ -4138,9 +4138,9 @@
],
"support": {
"issues": "https://github.com/mikehaertl/php-shellcommand/issues",
"source": "https://github.com/mikehaertl/php-shellcommand/tree/1.6.4"
"source": "https://github.com/mikehaertl/php-shellcommand/tree/1.7.0"
},
"time": "2021-03-17T06:54:33+00:00"
"time": "2023-04-19T08:25:22+00:00"
},
{
"name": "mpdf/mpdf",
......@@ -4820,26 +4820,26 @@
},
{
"name": "php-http/message-factory",
"version": "v1.0.2",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/message-factory.git",
"reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1"
"reference": "4d8778e1c7d405cbb471574821c1ff5b68cc8f57"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1",
"reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1",
"url": "https://api.github.com/repos/php-http/message-factory/zipball/4d8778e1c7d405cbb471574821c1ff5b68cc8f57",
"reference": "4d8778e1c7d405cbb471574821c1ff5b68cc8f57",
"shasum": ""
},
"require": {
"php": ">=5.4",
"psr/http-message": "^1.0"
"psr/http-message": "^1.0 || ^2.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.x-dev"
}
},
"autoload": {
......@@ -4868,9 +4868,9 @@
],
"support": {
"issues": "https://github.com/php-http/message-factory/issues",
"source": "https://github.com/php-http/message-factory/tree/master"
"source": "https://github.com/php-http/message-factory/tree/1.1.0"
},
"time": "2015-12-19T14:08:53+00:00"
"time": "2023-04-14T14:16:17+00:00"
},
{
"name": "phpoffice/phpspreadsheet",
......@@ -5198,21 +5198,21 @@
},
{
"name": "psr/http-client",
"version": "1.0.1",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
"reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
"reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
"reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
"url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
"reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
"shasum": ""
},
"require": {
"php": "^7.0 || ^8.0",
"psr/http-message": "^1.0"
"psr/http-message": "^1.0 || ^2.0"
},
"type": "library",
"extra": {
......@@ -5232,7 +5232,7 @@
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
"homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for HTTP clients",
......@@ -5244,27 +5244,27 @@
"psr-18"
],
"support": {
"source": "https://github.com/php-fig/http-client/tree/master"
"source": "https://github.com/php-fig/http-client/tree/1.0.2"
},
"time": "2020-06-29T06:28:15+00:00"
"time": "2023-04-10T20:12:12+00:00"
},
{
"name": "psr/http-factory",
"version": "1.0.1",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-factory.git",
"reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
"reference": "e616d01114759c4c489f93b099585439f795fe35"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
"reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
"url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
"reference": "e616d01114759c4c489f93b099585439f795fe35",
"shasum": ""
},
"require": {
"php": ">=7.0.0",
"psr/http-message": "^1.0"
"psr/http-message": "^1.0 || ^2.0"
},
"type": "library",
"extra": {
......@@ -5284,7 +5284,7 @@
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
"homepage": "https://www.php-fig.org/"
}
],
"description": "Common interfaces for PSR-7 HTTP message factories",
......@@ -5299,9 +5299,9 @@
"response"
],
"support": {
"source": "https://github.com/php-fig/http-factory/tree/master"
"source": "https://github.com/php-fig/http-factory/tree/1.0.2"
},
"time": "2019-04-30T12:38:16+00:00"
"time": "2023-04-10T20:10:41+00:00"
},
{
"name": "psr/http-message",
......@@ -5519,12 +5519,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "4bc7e4217fbc96c8f18283eb6425b6068fa5f8a0"
"reference": "39006a790754a68b3a476069297b0cb83abb17d2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4bc7e4217fbc96c8f18283eb6425b6068fa5f8a0",
"reference": "4bc7e4217fbc96c8f18283eb6425b6068fa5f8a0",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/39006a790754a68b3a476069297b0cb83abb17d2",
"reference": "39006a790754a68b3a476069297b0cb83abb17d2",
"shasum": ""
},
"conflict": {
......@@ -5545,7 +5545,7 @@
"andrewhaine/silverstripe-form-capture": ">=0.2,<=0.2.3|>=1,<=1.0.1|>=2,<=2.2.4",
"apereo/phpcas": "<1.6",
"api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6|>=2.6,<2.7.10|>=3,<3.0.12|>=3.1,<3.1.3",
"appwrite/server-ce": "<0.11.1|>=0.12,<0.12.2",
"appwrite/server-ce": "<=1.2.1",
"arc/web": "<3",
"area17/twill": "<1.2.5|>=2,<2.5.3",
"asymmetricrypt/asymmetricrypt": ">=0,<9.9.99",
......@@ -5678,7 +5678,7 @@
"friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
"friendsoftypo3/mediace": ">=7.6.2,<7.6.5",
"froala/wysiwyg-editor": "<3.2.7",
"froxlor/froxlor": "<2.0.13",
"froxlor/froxlor": "<2.0.14",
"fuel/core": "<1.8.1",
"funadmin/funadmin": "<=3.2",
"gaoming13/wechat-php-sdk": "<=1.10.2",
......@@ -5778,7 +5778,7 @@
"melisplatform/melis-front": "<5.0.1",
"mezzio/mezzio-swoole": "<3.7|>=4,<4.3",
"mgallegos/laravel-jqgrid": "<=1.3",
"microweber/microweber": "<=1.3.2",
"microweber/microweber": "<1.3.3",
"miniorange/miniorange-saml": "<1.4.3",
"mittwald/typo3_forum": "<1.2.1",
"mobiledetect/mobiledetectlib": "<2.8.32",
......@@ -5797,7 +5797,7 @@
"netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15",
"nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6",
"nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13",
"nilsteampassnet/teampass": "<3.0.0.23",
"nilsteampassnet/teampass": "<3.0.3",
"notrinos/notrinos-erp": "<=0.7",
"noumo/easyii": "<=0.9",
"nukeviet/nukeviet": "<4.5.2",
......@@ -5886,8 +5886,8 @@
"scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11",
"sensiolabs/connect": "<4.2.3",
"serluck/phpwhois": "<=4.2.6",
"shopware/core": "<=6.4.18",
"shopware/platform": "<=6.4.18",
"shopware/core": "<=6.4.20",
"shopware/platform": "<=6.4.20",
"shopware/production": "<=6.3.5.2",
"shopware/shopware": "<=5.7.14",
"shopware/storefront": "<=6.4.8.1",
......@@ -5916,6 +5916,7 @@
"simplesamlphp/simplesamlphp-module-openidprovider": "<0.9",
"simplito/elliptic-php": "<1.0.6",
"sitegeist/fluid-components": "<3.5",
"slim/psr7": "<1.6.1",
"slim/slim": "<2.6",
"smarty/smarty": "<3.1.48|>=4,<4.3.1",
"snipe/snipe-it": "<=6.0.14|>= 6.0.0-RC-1, <= 6.0.0-RC-5",
......@@ -6009,7 +6010,7 @@
"unisharp/laravel-filemanager": "<=2.5.1",
"userfrosting/userfrosting": ">=0.3.1,<4.6.3",
"usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2",
"uvdesk/community-skeleton": "<1.1",
"uvdesk/community-skeleton": "<=1.1.1",
"vanilla/safecurl": "<0.9.2",
"verot/class.upload.php": "<=1.0.3|>=2,<=2.0.4",
"vova07/yii2-fileapi-widget": "<0.1.9",
......@@ -6110,7 +6111,7 @@
"type": "tidelift"
}
],
"time": "2023-04-05T21:04:16+00:00"
"time": "2023-04-18T23:04:21+00:00"
},
{
"name": "schmunk42/retry",
......@@ -10167,22 +10168,22 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "7.5.0",
"version": "7.5.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
"reference": "b964ca597e86b752cd994f27293e9fa6b6a95ed9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
"reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/b964ca597e86b752cd994f27293e9fa6b6a95ed9",
"reference": "b964ca597e86b752cd994f27293e9fa6b6a95ed9",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.5",
"guzzlehttp/psr7": "^1.9 || ^2.4",
"guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
......@@ -10275,7 +10276,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.5.0"
"source": "https://github.com/guzzle/guzzle/tree/7.5.1"
},
"funding": [
{
......@@ -10291,7 +10292,7 @@
"type": "tidelift"
}
],
"time": "2022-08-28T15:39:27+00:00"
"time": "2023-04-17T16:30:08+00:00"
},
{
"name": "guzzlehttp/promises",
......@@ -10379,22 +10380,22 @@
},
{
"name": "guzzlehttp/psr7",
"version": "2.4.4",
"version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf"
"reference": "b635f279edd83fc275f822a1188157ffea568ff6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf",
"reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
"reference": "b635f279edd83fc275f822a1188157ffea568ff6",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0",
"psr/http-message": "^1.1 || ^2.0",
"ralouphie/getallheaders": "^3.0"
},
"provide": {
......@@ -10414,9 +10415,6 @@
"bamarni-bin": {
"bin-links": true,
"forward-command": false
},
"branch-alias": {
"dev-master": "2.4-dev"
}
},
"autoload": {
......@@ -10478,7 +10476,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.4.4"
"source": "https://github.com/guzzle/psr7/tree/2.5.0"
},
"funding": [
{
......@@ -10494,7 +10492,7 @@
"type": "tidelift"
}
],
"time": "2023-03-09T13:19:02+00:00"
"time": "2023-04-17T16:11:26+00:00"
},
{
"name": "nikic/php-parser",
......@@ -11049,16 +11047,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.6.6",
"version": "9.6.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115"
"reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b65d59a059d3004a040c16a82e07bbdf6cfdd115",
"reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2",
"reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2",
"shasum": ""
},
"require": {
......@@ -11132,7 +11130,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.6"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7"
},
"funding": [
{
......@@ -11148,7 +11146,7 @@
"type": "tidelift"
}
],
"time": "2023-03-27T11:43:46+00:00"
"time": "2023-04-14T08:58:40+00:00"
},
{
"name": "psr/cache",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment