bugfix: 修复Dockerfile错误
Gitea Action for docker build / build-app (push) Successful in 37s Details
Gitea Action for docker build runtime / build-runtime (push) Successful in 2m40s Details

This commit is contained in:
chenwj113 2024-06-11 17:06:19 +08:00
parent 2ee8beb276
commit 598bb654c7
5 changed files with 18 additions and 20 deletions

View File

@ -16,11 +16,10 @@ COPY pyproject.toml .
# && apt-get clean
# RUN pip install -r requirements.txt -i https://mirrors.aliyun.com/pypi/simple/ --prefix=/install
RUN pip install -r poetry -i https://mirrors.aliyun.com/pypi/simple/
RUN pip install poetry -i https://mirrors.aliyun.com/pypi/simple/ \
&& poetry source add --priority=primary mirrors https://pypi.tuna.tsinghua.edu.cn/simple/ \
&& poetry install -C /install
RUN poetry source add --priority=primary mirrors https://pypi.tuna.tsinghua.edu.cn/simple/
RUN poetry install -C /install
# 应用启动
FROM python:3.11-slim

View File

@ -4,17 +4,16 @@ lifetime_seconds=3600
[mysql]
username=root
password=123456
host=mysql
password=Chenweijia113!
host=127.0.0.1
port=3306
database=test
[redis]
redis_url=""
redis_host=redis
redis_host=127.0.0.1
redis_port=6379
redis_password=""
redis_password=
[rabbitmq]
rabbitmq_host=rabbitmq

View File

@ -4,17 +4,16 @@ lifetime_seconds=3600
[mysql]
username=root
password=123456
password=Chenweijia113!
host=mysql
port=3306
database=test
[redis]
redis_url=""
redis_host=redis
redis_port=6379
redis_password=""
redis_password=Chenweijia113!
[rabbitmq]
rabbitmq_host=rabbitmq

View File

@ -34,7 +34,6 @@ class MySQLConfig(BaseSettings):
class RedisConfig(RedisSettings):
redis_url: str = None
redis_host: Optional[str] = 'localhost'
redis_port: Optional[int] = 6379
redis_password: str = None
@ -60,7 +59,7 @@ def init_config():
# common_config = CommonConfig(**dict(config.items('common')))
mysql_config = MySQLConfig(**dict(config.items('mysql')))
redis_config = RedisConfig(**dict(config.items('redis')))
rabbitmq_config = RabbitmqConfig(**dict(config.items("rabbitmq")))
# rabbitmq_config = RabbitmqConfig(**dict(config.items("rabbitmq")))
# return common_config, mysql_config, redis_config, rabbitmq_config
return mysql_config, redis_config
except Exception as e:

14
main.py
View File

@ -15,6 +15,11 @@ from src.utils.exception import (http_exception_handler,
def create_app():
app = FastAPI()
mysql_config, redis_config = init_config()
# 添加sqlalchemy数据库中间件
# once the middleware is applied, any route can then access the database session from the global ``db``
app.add_middleware(DBSessionMiddleware, db_url=mysql_config.sqlalchemy_db_uri)
@app.on_event("startup")
async def startup_event():
# 创建日志文件夹和临时文件上传文件夹
@ -26,13 +31,10 @@ def create_app():
os.mkdir("logs")
logging_config.fileConfig('conf/log.ini')
# 初始化配置文件
mysql_config, redis_config = init_config()
# 添加sqlalchemy数据库中间件
# once the middleware is applied, any route can then access the database session from the global ``db``
# app.add_middleware(DBSessionMiddleware, db_url=mysql_config.sqlalchemy_db_uri)
# Redis 缓存初始化
# await fastapi_plugins.redis_plugin.init_app(app, redis_config)
# await fastapi_plugins.redis_plugin.init()
print(redis_config)
await fastapi_plugins.redis_plugin.init_app(app, redis_config)
await fastapi_plugins.redis_plugin.init()
@app.on_event("shutdown")
async def shutdown_event():