From 82a47a7b8d10e90608a9bda41cfb1e1d900527d2 Mon Sep 17 00:00:00 2001 From: Heaven Date: Sat, 13 Jun 2020 19:40:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=89=93=E5=8C=85=E9=95=9C?= =?UTF-8?q?=E5=83=8F,=E5=B0=86=E7=8E=AF=E5=A2=83=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=85=A8=E9=83=A8=E8=BD=AC=E4=B8=BA=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E5=86=85=E6=9D=A5=E6=93=8D=E4=BD=9C=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 36 ++--------- .../docker-compose.yml | 0 docker/nginx_default.conf | 64 +++++++++++++++++++ {doc => docker}/nginx_ops.conf | 12 ++-- docker/prestart.sh | 38 +++++++++++ {doc => docker}/supervisor_ops.conf | 14 +++- doc/requirements.txt => requirements.txt | 0 7 files changed, 127 insertions(+), 37 deletions(-) rename docker-compose.yml => docker/docker-compose.yml (100%) create mode 100644 docker/nginx_default.conf rename {doc => docker}/nginx_ops.conf (77%) create mode 100644 docker/prestart.sh rename {doc => docker}/supervisor_ops.conf (83%) rename doc/requirements.txt => requirements.txt (100%) diff --git a/Dockerfile b/Dockerfile index ee11562..de440bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,38 +1,12 @@ -FROM centos:7 -# 设置编码 -ENV LANG en_US.UTF-8 -# 同步时间 -ENV TZ=Asia/Shanghai -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +FROM registry.cn-hangzhou.aliyuncs.com/sourcegarden/python:centos7-3.6 -# 1. 安装基本依赖 -RUN yum update -y && yum install epel-release -y && yum update -y && yum install wget unzip epel-release nginx xz gcc automake zlib-devel openssl-devel supervisor groupinstall development libxslt-devel libxml2-devel libcurl-devel git -y -#WORKDIR /var/www/ - -# 2. 准备python -RUN wget https://www.python.org/ftp/python/3.6.6/Python-3.6.6.tar.xz -RUN xz -d Python-3.6.6.tar.xz && tar xvf Python-3.6.6.tar && cd Python-3.6.6 && ./configure && make && make install - -# 3. 安装pip依赖 -RUN pip3 install --upgrade pip -RUN pip3 install -U git+https://github.com/ss1917/ops_sdk.git - -# 4. 复制代码 -RUN mkdir -p /var/www/ ADD . /var/www/codo-task/ -# 5. 安装pip依赖 -RUN pip3 install -r /var/www/codo-task/doc/requirements.txt - -# 6. 初始化生成表结构 -#RUN python3 /var/www/codo-task/db_sync.py - -# 7. 日志 -VOLUME /var/log/ +RUN pip3 install -r /var/www/codo-task/requirements.txt -# 8. 准备文件 -COPY doc/nginx_ops.conf /etc/nginx/conf.d/default.conf -COPY doc/supervisor_ops.conf /etc/supervisord.conf +COPY docker/nginx_default.conf /etc/nginx/nginx.conf +COPY docker/nginx_ops.conf /etc/nginx/conf.d/default.conf +COPY docker/supervisor_ops.conf /etc/supervisord.conf EXPOSE 80 CMD ["/usr/bin/supervisord"] \ No newline at end of file diff --git a/docker-compose.yml b/docker/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to docker/docker-compose.yml diff --git a/docker/nginx_default.conf b/docker/nginx_default.conf new file mode 100644 index 0000000..e5709d3 --- /dev/null +++ b/docker/nginx_default.conf @@ -0,0 +1,64 @@ +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log; +pid /run/nginx.pid; + +# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic. +include /usr/share/nginx/modules/*.conf; + +events { + worker_connections 1024; +} + +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + # Load modular configuration files from the /etc/nginx/conf.d directory. + # See http://nginx.org/en/docs/ngx_core_module.html#include + # for more information. + include /etc/nginx/conf.d/*.conf; + +# Settings for a TLS enabled server. +# +# server { +# listen 443 ssl http2 default_server; +# listen [::]:443 ssl http2 default_server; +# server_name _; +# root /usr/share/nginx/html; +# +# ssl_certificate "/etc/pki/nginx/server.crt"; +# ssl_certificate_key "/etc/pki/nginx/private/server.key"; +# ssl_session_cache shared:SSL:1m; +# ssl_session_timeout 10m; +# ssl_ciphers HIGH:!aNULL:!MD5; +# ssl_prefer_server_ciphers on; +# +# # Load configuration files for the default server block. +# include /etc/nginx/default.d/*.conf; +# +# location / { +# } +# +# error_page 404 /404.html; +# location = /40x.html { +# } +# +# error_page 500 502 503 504 /50x.html; +# location = /50x.html { +# } +# } + +} \ No newline at end of file diff --git a/doc/nginx_ops.conf b/docker/nginx_ops.conf similarity index 77% rename from doc/nginx_ops.conf rename to docker/nginx_ops.conf index 91d35aa..ccb5c43 100644 --- a/doc/nginx_ops.conf +++ b/docker/nginx_ops.conf @@ -1,11 +1,11 @@ -upstream codo-task{ +upstream codo-task-nginx{ server 127.0.0.1:8900; server 127.0.0.1:8901; server 127.0.0.1:8902; server 127.0.0.1:8903; } -upstream task-other{ +upstream task-other-nginx{ server 127.0.0.1:9600; server 127.0.0.1:9601; server 127.0.0.1:9602; @@ -14,12 +14,14 @@ upstream task-other{ server { listen 80; server_name task.opendevops.cn; + access_log /var/log/nginx/codo-task-access.log; + error_log /var/log/nginx/codo-task-error.log; location / { proxy_set_header Host $http_host; proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Scheme $scheme; - proxy_pass http://codo-task; + proxy_pass http://codo-task-nginx; } location /ws/ { @@ -32,13 +34,13 @@ server { proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Scheme $scheme; - proxy_pass http://task-other; + proxy_pass http://task-other-nginx; } location /other/ { proxy_set_header Host $http_host; proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Scheme $scheme; - proxy_pass http://task-other; + proxy_pass http://task-other-nginx; } } \ No newline at end of file diff --git a/docker/prestart.sh b/docker/prestart.sh new file mode 100644 index 0000000..c20889d --- /dev/null +++ b/docker/prestart.sh @@ -0,0 +1,38 @@ +#!/bin/sh +cd /var/www/codo-task/ + +#任务系统-task +TASK_DB_DBNAME='codo_task' +sed -i "s#cookie_secret = .*#cookie_secret = '${cookie_secret}'#g" settings.py +sed -i "s#DEFAULT_DB_DBHOST = .*#DEFAULT_DB_DBHOST = os.getenv('DEFAULT_DB_DBHOST', '${DEFAULT_DB_DBHOST}')#g" settings.py +sed -i "s#DEFAULT_DB_DBPORT = .*#DEFAULT_DB_DBPORT = os.getenv('DEFAULT_DB_DBPORT', '${DEFAULT_DB_DBPORT}')#g" settings.py +sed -i "s#DEFAULT_DB_DBUSER = .*#DEFAULT_DB_DBUSER = os.getenv('DEFAULT_DB_DBUSER', '${DEFAULT_DB_DBUSER}')#g" settings.py +sed -i "s#DEFAULT_DB_DBPWD = .*#DEFAULT_DB_DBPWD = os.getenv('DEFAULT_DB_DBPWD', '${DEFAULT_DB_DBPWD}')#g" settings.py +sed -i "s#DEFAULT_DB_DBNAME = .*#DEFAULT_DB_DBNAME = os.getenv('DEFAULT_DB_DBNAME', '${TASK_DB_DBNAME}')#g" settings.py +sed -i "s#READONLY_DB_DBHOST = .*#READONLY_DB_DBHOST = os.getenv('READONLY_DB_DBHOST', '${READONLY_DB_DBHOST}')#g" settings.py +sed -i "s#READONLY_DB_DBPORT = .*#READONLY_DB_DBPORT = os.getenv('READONLY_DB_DBPORT', '${READONLY_DB_DBPORT}')#g" settings.py +sed -i "s#READONLY_DB_DBUSER = .*#READONLY_DB_DBUSER = os.getenv('READONLY_DB_DBUSER', '${READONLY_DB_DBUSER}')#g" settings.py +sed -i "s#READONLY_DB_DBPWD = .*#READONLY_DB_DBPWD = os.getenv('READONLY_DB_DBPWD', '${READONLY_DB_DBPWD}')#g" settings.py +sed -i "s#READONLY_DB_DBNAME = .*#READONLY_DB_DBNAME = os.getenv('READONLY_DB_DBNAME', '${TASK_DB_DBNAME}')#g" settings.py +sed -i "s#DEFAULT_REDIS_HOST = .*#DEFAULT_REDIS_HOST = os.getenv('DEFAULT_REDIS_HOST', '${DEFAULT_REDIS_HOST}')#g" settings.py +sed -i "s#DEFAULT_REDIS_PORT = .*#DEFAULT_REDIS_PORT = os.getenv('DEFAULT_REDIS_PORT', '${DEFAULT_REDIS_PORT}')#g" settings.py +sed -i "s#DEFAULT_REDIS_PASSWORD = .*#DEFAULT_REDIS_PASSWORD = os.getenv('DEFAULT_REDIS_PASSWORD', '${DEFAULT_REDIS_PASSWORD}')#g" settings.py +sed -i "s#DEFAULT_MQ_ADDR = .*#DEFAULT_MQ_ADDR = os.getenv('DEFAULT_MQ_ADDR', '${DEFAULT_MQ_ADDR}')#g" settings.py +sed -i "s#DEFAULT_MQ_USER = .*#DEFAULT_MQ_USER = os.getenv('DEFAULT_MQ_USER', '${DEFAULT_MQ_USER}')#g" settings.py +sed -i "s#DEFAULT_MQ_PWD = .*#DEFAULT_MQ_PWD = os.getenv('DEFAULT_MQ_PWD', '${DEFAULT_MQ_PWD}')#g" settings.py + + + +try_num=0 + +while [[ $try_num -le 100 ]]; +do + if $(curl -s ${DEFAULT_DB_DBHOST}:${DEFAULT_DB_DBPORT} > /dev/null);then + python3 db_sync.py + exit 0 + else + echo 'wait mysql start to do db_sync.py' + fi + let try_num+=1 + sleep 6 +done \ No newline at end of file diff --git a/doc/supervisor_ops.conf b/docker/supervisor_ops.conf similarity index 83% rename from doc/supervisor_ops.conf rename to docker/supervisor_ops.conf index 23d3f9d..30bb0ec 100644 --- a/doc/supervisor_ops.conf +++ b/docker/supervisor_ops.conf @@ -2,7 +2,19 @@ nodaemon=true [group:task_scheduler] -programs=task_api,exec_task,log_record,task_other,cron_app +programs=task_api,exec_task,log_record,task_other,cron_app,task-prestart + +[program:task-prestart] +command=sh docker/prestart.sh +directory=/var/www/codo-task +user=root +autostart = true +autorestart=false +redirect_stderr=true +stdout_logfile=/var/log/supervisor/codo-task-prestart.log +loglevel=info +logfile_maxbytes=10MB +logfile_backups=1 [program:task_api] command=python3 startup.py --service=task_api --port=89%(process_num)02d diff --git a/doc/requirements.txt b/requirements.txt similarity index 100% rename from doc/requirements.txt rename to requirements.txt