diff --git a/Dockerfile b/Dockerfile index 0f9506d..86425e4 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/ +ADD ./ /var/www/kerrigan/ -# 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 +RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r /var/www/kerrigan/requirements.txt -# 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/kerrigan/ - -# 5. 安装pip依赖 -RUN pip3 install -r /var/www/kerrigan/doc/requirements.txt - -# 6. 初始化生成表结构 -#RUN python3 /var/www/kerrigan/db_sync.py - -# 7. 日志 -VOLUME /var/log/ - -# 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/codo-kerrigan.conf +COPY docker/supervisor_ops.conf /etc/supervisord.conf EXPOSE 80 -CMD ["/usr/bin/supervisord"] \ No newline at end of file +CMD ["/usr/bin/supervisord"] diff --git a/db_sync.py b/db_sync.py index 54c5cfd..9023dd8 100644 --- a/db_sync.py +++ b/db_sync.py @@ -4,7 +4,7 @@ Contact : 191715030@qq.com Author : shenshuo Date : 2018/12/24 -Desc : +Desc : """ from models.kerrigan import Base diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 5fd8009..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -codo-kerrigan: - restart: unless-stopped - image: kerrigan_image - volumes: - - /var/log/supervisor/:/var/log/supervisor/ - - /opt/ops_scripts:/opt/ops_scripts - - /sys/fs/cgroup:/sys/fs/cgroup - ports: - - "8030:80" 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 63% rename from doc/nginx_ops.conf rename to docker/nginx_ops.conf index 31fee27..ddcc609 100644 --- a/doc/nginx_ops.conf +++ b/docker/nginx_ops.conf @@ -1,18 +1,18 @@ -upstream codo-kerrigan{ +upstream codo-kerrigan-nginx{ server 127.0.0.1:8800; server 127.0.0.1:8801; } - server { listen 80; server_name kerrigan.opendevops.cn; + access_log /var/log/nginx/codo-kerrigan-access.log; + error_log /var/log/nginx/codo-kerrigan-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-kerrigan; - + proxy_pass http://codo-kerrigan-nginx; } } \ No newline at end of file diff --git a/docker/prestart.sh b/docker/prestart.sh new file mode 100644 index 0000000..b936358 --- /dev/null +++ b/docker/prestart.sh @@ -0,0 +1,30 @@ +#!/bin/sh +cd /var/www/kerrigan/ + +DEFAULT_DB_DBNAME='codo_kerrigan' +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', '${DEFAULT_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', '${DEFAULT_DB_DBNAME}')#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 61% rename from doc/supervisor_ops.conf rename to docker/supervisor_ops.conf index 506ad7b..00fe289 100644 --- a/doc/supervisor_ops.conf +++ b/docker/supervisor_ops.conf @@ -2,7 +2,19 @@ nodaemon=true [group:kerrigan] -programs=kerrigan +programs=kerrigan-prestart,kerrigan + +[program:kerrigan-prestart] +command=sh docker/prestart.sh +directory=/var/www/kerrigan +user=root +autostart = true +autorestart=false +redirect_stderr=true +stdout_logfile=/var/log/supervisor/codo-kerrigan-prestart.log +loglevel=info +logfile_maxbytes=10MB +logfile_backups=1 [program:kerrigan] command=python3 startup.py --service=kerrigan --port=88%(process_num)02d diff --git a/doc/requirements.txt b/requirements.txt similarity index 100% rename from doc/requirements.txt rename to requirements.txt