浏览代码

加入gateway

owen-carter 6 年之前
父节点
当前提交
27a6249996
共有 5 个文件被更改,包括 15 次插入27 次删除
  1. 1 1
      Dockerfile
  2. 12 2
      docker-compose.yml
  3. 0 23
      gunicorn.conf
  4. 1 0
      init.sql
  5. 1 1
      walle/config/settings_prod.py

+ 1 - 1
Dockerfile

@@ -8,6 +8,6 @@ RUN pip install futures
 RUN pip install -r prod.txt -i https://mirrors.aliyun.com/pypi/simple
 
 COPY . .
-#RUN python waller.py db upgrade
+RUN python waller.py db upgrade
 
 CMD python waller.py start

+ 12 - 2
docker-compose.yml

@@ -5,15 +5,20 @@ services:
   mysql:
     image: mysql
     ports:
-      - 3306:3306
+      - 0.0.0.0:3306:3306
+    expose:
+      - 3306
     environment:
       MYSQL_ROOT_PASSWORD: walle
 
       MYSQL_DATABASE: walle
+
       MYSQL_USER: walle
       MYSQL_PASSWORD: walle
+    command: --default-authentication-plugin=mysql_native_password
     volumes:
       - ${HOME}/.walle/mysql:/var/lib/mysql
+      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
     restart: always
 
   web:
@@ -21,13 +26,18 @@ services:
     links:
       - mysql
     ports:
-      - 0.0.0.0:8000:5000
+      - 0.0.0.0:5000:5000
+    expose:
+      - 5000
     environment:
       - WALLE_SECRET="guess me out"
     restart: always
 
   gateway:
     image: nginx
+    links:
+      - mysql
+      - web
     ports:
       - 0.0.0.0:80:80
     volumes:

+ 0 - 23
gunicorn.conf

@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# 并行工作进程数
-workers = 4
-
-# 指定每个工作者的线程数
-threads = 2
-
-# 设置守护进程【关闭连接时,程序仍在运行】
-daemon = True
-
-# 设置超时时间120s,默认为30s。按自己的需求进行设置
-timeout = 120
-
-# 监听内网端口5000
-bind = '0.0.0.0:8000'
-
-# 设置日志记录水平
-loglevel = 'warning'
-
-# 设置访问日志和错误信息日志路径
-accesslog = './logs/acess.log'
-errorlog = './logs/error.log'

+ 1 - 0
init.sql

@@ -0,0 +1 @@
+mysql  -hmysql -uwalle -pwalle -e'CREATE SCHEMA walle';

+ 1 - 1
walle/config/settings_prod.py

@@ -32,7 +32,7 @@ class ProdConfig(Config):
     CACHE_TYPE = 'simple'
 
     # 数据库设置 @TODO
-    SQLALCHEMY_DATABASE_URI = 'mysql://walle:walle@localhost/walle'
+    SQLALCHEMY_DATABASE_URI = 'mysql://walle:walle@mysql/walle'
 
     # 设置session的保存时间。
     PERMANENT_SESSION_LIFETIME = timedelta(days=1)