From f54c8ad1ad16e584072896c335f0266c9200fc54 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Wed, 23 Nov 2016 23:43:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B7=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20php=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=D0=B0=20=D0=A0=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?= =?UTF-8?q?=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20app=20=D1=81=D0=B5=D1=80?= =?UTF-8?q?=D0=B2=D0=B8=D1=81=D0=B0=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20cron=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=87=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D0=BA=D0=B8=20=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88?= =?UTF-8?q?=D0=B8=D1=85=20access=5Ftoken'=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 +++- Dockerfile-dev | 6 +++- docker/cron/cleanup | 2 ++ docker/php/composer.sh | 8 ----- docker/php/entrypoint.sh | 38 --------------------- docker/php/php.ini | 2 -- docker/php/supervisord.conf | 36 ------------------- docker/supervisor/account-queue-worker.conf | 6 ++++ 8 files changed, 18 insertions(+), 86 deletions(-) create mode 100644 docker/cron/cleanup delete mode 100644 docker/php/composer.sh delete mode 100644 docker/php/entrypoint.sh delete mode 100644 docker/php/php.ini delete mode 100644 docker/php/supervisord.conf create mode 100644 docker/supervisor/account-queue-worker.conf diff --git a/Dockerfile b/Dockerfile index ef80df9..f750e08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,8 @@ -FROM registry.ely.by/elyby/accounts-php:1.0.0 +FROM registry.ely.by/elyby/accounts-php:1.1.0 + +# Вносим конфигурации для крона и воркеров +COPY docker/cron/* /etc/cron.d/ +COPY docker/supervisor/* /etc/supervisor/conf.d/ COPY id_rsa /root/.ssh/id_rsa diff --git a/Dockerfile-dev b/Dockerfile-dev index e3e5ebb..86bee41 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -1,4 +1,8 @@ -FROM registry.ely.by/elyby/accounts-php:1.0.0-dev +FROM registry.ely.by/elyby/accounts-php:1.1.0-dev + +# Вносим конфигурации для крона и воркеров +COPY docker/cron/* /etc/cron.d/ +COPY docker/supervisor/* /etc/supervisor/conf.d/ COPY id_rsa /root/.ssh/id_rsa diff --git a/docker/cron/cleanup b/docker/cron/cleanup new file mode 100644 index 0000000..4c056e7 --- /dev/null +++ b/docker/cron/cleanup @@ -0,0 +1,2 @@ +# https://crontab.guru/every-hour +0 * * * * php /var/www/html/yii cleanup/access-tokens >/dev/null 2>&1 diff --git a/docker/php/composer.sh b/docker/php/composer.sh deleted file mode 100644 index 517b5d0..0000000 --- a/docker/php/composer.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [ -n "$API_TOKEN" ] -then - php /usr/local/bin/composer.phar config -g github-oauth.github.com $API_TOKEN -fi - -exec php /usr/local/bin/composer.phar "$@" diff --git a/docker/php/entrypoint.sh b/docker/php/entrypoint.sh deleted file mode 100644 index f6723cb..0000000 --- a/docker/php/entrypoint.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -cd /var/www/html - -if [ "$1" = "bash" ] || [ "$1" = "composer" ] -then - exec "$@" - exit 0 -fi - -# Переносим vendor, если его нету или он изменился (или затёрся силами volume) -if ! cmp -s ./../vendor/autoload.php ./vendor/autoload.php -then - echo "vendor have diffs..." - echo "removing exists vendor" - rm -rf ./vendor - echo "copying new one" - cp -r ./../vendor ./vendor -fi - -# Переносим dist, если его нету или он изменился (или затёрся силами volume) -if ! cmp -s ./../dist/index.html ./frontend/dist/index.html -then - echo "frontend dist have diffs..." - echo "removing exists dist" - rm -rf ./frontend/dist - echo "copying new one" - cp -r ./../dist ./frontend/dist -fi - -if [ "$YII_ENV" != "test" ] -then - wait-for-it db:3306 -s -- "php /var/www/html/yii migrate/up --interactive=0" -else - wait-for-it testdb:3306 -s -- "php /var/www/html/tests/codeception/bin/yii migrate/up --interactive=0" -fi - -exec "$@" diff --git a/docker/php/php.ini b/docker/php/php.ini deleted file mode 100644 index a9c3fab..0000000 --- a/docker/php/php.ini +++ /dev/null @@ -1,2 +0,0 @@ -error_reporting = E_ALL; -display_errors = On; diff --git a/docker/php/supervisord.conf b/docker/php/supervisord.conf deleted file mode 100644 index 22c385c..0000000 --- a/docker/php/supervisord.conf +++ /dev/null @@ -1,36 +0,0 @@ -[supervisord] -logfile=/tmp/supervisord.log ; (main log file;default $CWD/supervisord.log) -logfile_maxbytes=50MB ; (max main logfile bytes b4 rotation;default 50MB) -logfile_backups=10 ; (num of main logfile rotation backups;default 10) -loglevel=info ; (log level;default info; others: debug,warn,trace) -pidfile=/tmp/supervisord.pid ; (supervisord pidfile;default supervisord.pid) -nodaemon=false ; (start in foreground if true;default false) -minfds=1024 ; (min. avail startup file descriptors;default 1024) -minprocs=200 ; (min. avail process descriptors;default 200) -user=root - -; the below section must remain in the config file for RPC -; (supervisorctl/web interface) to work, additional interfaces may be -; added by defining them in separate rpcinterface: sections -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl=unix:///dev/shm/supervisor.sock ; use a unix:// URL for a unix socket - -[program:php-fpm] -command=php-fpm -autostart=true -autorestart=true -priority=5 -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 - -[program:account-queue-worker] -directory=/var/www/html -command=wait-for-it rabbitmq:5672 -- php yii account-queue -autostart=true -autorestart=true -priority=10 diff --git a/docker/supervisor/account-queue-worker.conf b/docker/supervisor/account-queue-worker.conf new file mode 100644 index 0000000..aed1af3 --- /dev/null +++ b/docker/supervisor/account-queue-worker.conf @@ -0,0 +1,6 @@ +[program:account-queue-worker] +directory=/var/www/html +command=wait-for-it rabbitmq:5672 -- php yii account-queue +autostart=true +autorestart=true +priority=10