Update Dockerfile

This commit is contained in:
Alexander Pankratov 2021-08-16 03:59:07 +03:00
parent 857bc83f37
commit c0394e809c
4 changed files with 26 additions and 25 deletions

View File

@ -1,6 +1,6 @@
FROM php:8.0-zts FROM php:8.0-cli
ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.7.3/wait /usr/local/bin/docker-compose-wait ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.9.0/wait /usr/local/bin/docker-compose-wait
RUN apt-get update && apt-get upgrade -y \ RUN apt-get update && apt-get upgrade -y \
&& apt-get install apt-utils procps -y \ && apt-get install apt-utils procps -y \
@ -9,9 +9,7 @@ RUN apt-get update && apt-get upgrade -y \
&& docker-php-ext-install -j$(nproc) sockets zip gmp pcntl bcmath ffi mysqli pdo pdo_mysql \ && docker-php-ext-install -j$(nproc) sockets zip gmp pcntl bcmath ffi mysqli pdo pdo_mysql \
# Install additional extension # Install additional extension
&& mkdir -p /usr/src/php/ext/ && cd /usr/src/php/ext/ \ && mkdir -p /usr/src/php/ext/ && cd /usr/src/php/ext/ \
#&& pecl bundle event \
&& pecl bundle ev \ && pecl bundle ev \
#&& docker-php-ext-configure event --with-event-core --with-event-extra --with-event-pthreads \
&& docker-php-ext-install -j$(nproc) ev \ && docker-php-ext-install -j$(nproc) ev \
# Install composer # Install composer
&& chmod +x /usr/local/bin/docker-compose-wait \ && chmod +x /usr/local/bin/docker-compose-wait \
@ -25,15 +23,16 @@ COPY . /app
WORKDIR /app WORKDIR /app
RUN cp -a docker/php/conf.d/. "$PHP_INI_DIR/conf.d/" \ RUN cp -a docker/php/conf.d/. "$PHP_INI_DIR/conf.d/" \
&& composer install --no-dev --ignore-platform-reqs \ && composer install -o --no-dev \
&& composer clear && composer clear
VOLUME ["/app/sessions"]
#Creating symlink to save .env in volume #Creating symlink to save .env in volume
RUN touch '/app/sessions/.env.docker' && \ RUN mkdir /app/sessions && \
touch '/app/sessions/.env.docker' && \
ln -s '/app/sessions/.env.docker' '/app/.env.docker' ln -s '/app/sessions/.env.docker' '/app/.env.docker'
VOLUME ["/app/sessions"]
EXPOSE 9503 EXPOSE 9503
ENTRYPOINT docker-compose-wait && nice -n 20 php server.php -e=.env.docker --docker -s=* ENTRYPOINT docker-compose-wait && nice -n 20 php server.php -e=.env.docker --docker -s=*

33
composer.lock generated
View File

@ -2537,16 +2537,16 @@
}, },
{ {
"name": "danog/tg-file-decoder", "name": "danog/tg-file-decoder",
"version": "0.1.5", "version": "0.1.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/danog/tg-file-decoder.git", "url": "https://github.com/danog/tg-file-decoder.git",
"reference": "1394bbdc11c37c1291fa357e4f3fde7d70c498ab" "reference": "336d0bd69f3eb0592fab7c3e934cdd0e4a8acf61"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/danog/tg-file-decoder/zipball/1394bbdc11c37c1291fa357e4f3fde7d70c498ab", "url": "https://api.github.com/repos/danog/tg-file-decoder/zipball/336d0bd69f3eb0592fab7c3e934cdd0e4a8acf61",
"reference": "1394bbdc11c37c1291fa357e4f3fde7d70c498ab", "reference": "336d0bd69f3eb0592fab7c3e934cdd0e4a8acf61",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2588,7 +2588,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/danog/tg-file-decoder/issues", "issues": "https://github.com/danog/tg-file-decoder/issues",
"source": "https://github.com/danog/tg-file-decoder/tree/0.1.5" "source": "https://github.com/danog/tg-file-decoder/tree/0.1.8"
}, },
"funding": [ "funding": [
{ {
@ -2596,7 +2596,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-04-01T18:37:52+00:00" "time": "2021-08-14T15:11:43+00:00"
}, },
{ {
"name": "danog/tgseclib", "name": "danog/tgseclib",
@ -3915,12 +3915,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "52a126190a36bc9236846f5d42e10bff9ff60d72" "reference": "6da216d969efa7e52cc7d0af125b8c8bb9caed25"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/52a126190a36bc9236846f5d42e10bff9ff60d72", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6da216d969efa7e52cc7d0af125b8c8bb9caed25",
"reference": "52a126190a36bc9236846f5d42e10bff9ff60d72", "reference": "6da216d969efa7e52cc7d0af125b8c8bb9caed25",
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@ -3953,7 +3953,7 @@
"composer/composer": "<1.10.22|>=2-alpha.1,<2.0.13", "composer/composer": "<1.10.22|>=2-alpha.1,<2.0.13",
"contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1",
"contao/core": ">=2,<3.5.39", "contao/core": ">=2,<3.5.39",
"contao/core-bundle": ">=4,<4.4.52|>=4.5,<4.9.16|>=4.10,<4.11.5|= 4.10.0", "contao/core-bundle": ">=4,<4.4.56|>=4.5,<4.9.18|>=4.10,<4.11.7|= 4.10.0",
"contao/listing-bundle": ">=4,<4.4.8", "contao/listing-bundle": ">=4,<4.4.8",
"craftcms/cms": "<3.6.7", "craftcms/cms": "<3.6.7",
"croogo/croogo": "<3.0.7", "croogo/croogo": "<3.0.7",
@ -3970,7 +3970,7 @@
"doctrine/mongodb-odm": ">=1,<1.0.2", "doctrine/mongodb-odm": ">=1,<1.0.2",
"doctrine/mongodb-odm-bundle": ">=2,<3.0.1", "doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
"doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4",
"dolibarr/dolibarr": "<11.0.4", "dolibarr/dolibarr": "<14",
"dompdf/dompdf": ">=0.6,<0.6.2", "dompdf/dompdf": ">=0.6,<0.6.2",
"drupal/core": ">=7,<7.80|>=8,<8.9.14|>=9,<9.0.12|>=9.1,<9.1.7", "drupal/core": ">=7,<7.80|>=8,<8.9.14|>=9,<9.0.12|>=9.1,<9.1.7",
"drupal/drupal": ">=7,<7.80|>=8,<8.9.14|>=9,<9.0.12|>=9.1,<9.1.7", "drupal/drupal": ">=7,<7.80|>=8,<8.9.14|>=9,<9.0.12|>=9.1,<9.1.7",
@ -4017,6 +4017,7 @@
"gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3", "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3",
"gree/jose": "<=2.2", "gree/jose": "<=2.2",
"gregwar/rst": "<1.0.3", "gregwar/rst": "<1.0.3",
"grumpydictator/firefly-iii": "<5.5.13",
"guzzlehttp/guzzle": ">=4-rc.2,<4.2.4|>=5,<5.3.1|>=6,<6.2.1", "guzzlehttp/guzzle": ">=4-rc.2,<4.2.4|>=5,<5.3.1|>=6,<6.2.1",
"illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10", "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10",
"illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4", "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4",
@ -4038,6 +4039,7 @@
"laminas/laminas-http": "<2.14.2", "laminas/laminas-http": "<2.14.2",
"laravel/framework": "<6.20.26|>=7,<8.40", "laravel/framework": "<6.20.26|>=7,<8.40",
"laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10",
"lavalite/cms": "<=5.8",
"league/commonmark": "<0.18.3", "league/commonmark": "<0.18.3",
"league/flysystem": "<1.1.4|>=2,<2.1.1", "league/flysystem": "<1.1.4|>=2,<2.1.1",
"lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3",
@ -4083,7 +4085,7 @@
"paragonie/random_compat": "<2", "paragonie/random_compat": "<2",
"passbolt/passbolt_api": "<2.11", "passbolt/passbolt_api": "<2.11",
"paypal/merchant-sdk-php": "<3.12", "paypal/merchant-sdk-php": "<3.12",
"pear/archive_tar": "<1.4.12", "pear/archive_tar": "<1.4.14",
"personnummer/personnummer": "<3.0.2", "personnummer/personnummer": "<3.0.2",
"phanan/koel": "<5.1.4", "phanan/koel": "<5.1.4",
"phpfastcache/phpfastcache": ">=5,<5.0.13", "phpfastcache/phpfastcache": ">=5,<5.0.13",
@ -4194,12 +4196,13 @@
"thelia/thelia": ">=2.1-beta.1,<2.1.3", "thelia/thelia": ">=2.1-beta.1,<2.1.3",
"theonedemon/phpwhois": "<=4.2.5", "theonedemon/phpwhois": "<=4.2.5",
"titon/framework": ">=0,<9.9.99", "titon/framework": ">=0,<9.9.99",
"topthink/think": "<=6.0.9",
"tribalsystems/zenario": "<8.8.53370", "tribalsystems/zenario": "<8.8.53370",
"truckersmp/phpwhois": "<=4.3.1", "truckersmp/phpwhois": "<=4.3.1",
"twig/twig": "<1.38|>=2,<2.7", "twig/twig": "<1.38|>=2,<2.7",
"typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.28|>=10,<10.4.18|>=11,<11.3.1", "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.3.2",
"typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", "typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
"typo3/cms-core": ">=6.2,<=6.2.56|>=7,<7.6.52|>=8,<8.7.41|>=9,<9.5.28|>=10,<10.4.18|>=11,<11.3.1", "typo3/cms-core": ">=6.2,<=6.2.56|>=7,<7.6.52|>=8,<8.7.41|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.3.2",
"typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
"typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6",
"typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3",
@ -4286,7 +4289,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-07-26T22:02:34+00:00" "time": "2021-08-11T16:04:32+00:00"
} }
], ],
"aliases": [], "aliases": [],

View File

@ -8,4 +8,4 @@ opcache.validate_timestamps=1
opcache.revalidate_freq=0 opcache.revalidate_freq=0
opcache.huge_code_pages=1 opcache.huge_code_pages=1
opcache.jit_buffer_size=100M opcache.jit_buffer_size=100M
opcache.jit=function opcache.jit=1205

View File

@ -6,7 +6,6 @@ use Amp\Delayed;
use Amp\Loop; use Amp\Loop;
use Amp\Promise; use Amp\Promise;
use danog\MadelineProto; use danog\MadelineProto;
use danog\MadelineProto\MTProto;
use InvalidArgumentException; use InvalidArgumentException;
use Psr\Log\LogLevel; use Psr\Log\LogLevel;
use RuntimeException; use RuntimeException;