suyiiyii/nonebot-bison
1
0
Fork 0
mirror of https://github.com/suyiiyii/nonebot-bison.git synced 2026-05-09 18:27:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔧 调整 Dockerfile 以及 Bison 的运行方式 (#447)

Browse Source 
* 🔧 调整 Dockerfile 以及 Bison的运行方式

* ⏪ 不再为环境变量配置里的空值使用默认值

* 🔧 为 docker.env.prod 内的配置填写默认值
This commit is contained in:
AzideCupric
2024-02-11 21:48:51 +08:00
committed by GitHub
parent 73f0ad71e6
commit 1a96d31dbf
12 changed files with 1446 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile
+4 -4
View File
@@ -3,13 +3,13 @@ ADD . /app
WORKDIR /app/admin-frontend
RUN yarn && yarn build
FROM python:3.9
FROM python:3.11
RUN python3 -m pip install poetry && poetry config virtualenvs.create false
WORKDIR /app
COPY ./pyproject.toml ./poetry.lock* /app/
RUN poetry install --no-root --no-dev
COPY ./README.md ./pyproject.toml ./poetry.lock* /app/
RUN poetry install --only=main,docker
ADD src /app/src
ADD bot.py /app/
COPY --from=frontend /app/nonebot_bison/admin_page/dist /app/nonebot_bison/admin_page/dist
ENV HOST=0.0.0.0
CMD ["python", "bot.py"]
CMD ["nb", "run"]
docker/Dockerfile_browser
+4 -5
View File
@@ -1,11 +1,10 @@
FROM python:3.9
RUN apt-get update && apt-get install -y fonts-wqy-microhei chromium
FROM python:3.11
RUN apt-get update && apt-get install -y fonts-wqy-microhei chromium nano
RUN python3 -m pip config set global.index-url https://mirrors.aliyun.com/pypi/simple
RUN python3 -m pip install poetry && poetry config virtualenvs.create false
WORKDIR /app
COPY ./pyproject.toml ./poetry.lock* /app/
RUN poetry install --no-root --no-dev
COPY ./README.md ./pyproject.toml ./poetry.lock* /app/
RUN poetry install --only=main,docker
ENV BISON_BROWSER=local:/usr/bin/chromium
ADD src /app/src
ADD bot.py /app/
ENV HOST=0.0.0.0
docker/Dockerfile_tuna
+4 -5
View File
@@ -1,10 +1,9 @@
FROM python:3.9
FROM python:3.11
RUN python3 -m pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
RUN python3 -m pip install poetry && poetry config virtualenvs.create false
WORKDIR /app
COPY ./pyproject.toml ./poetry.lock* /app/
RUN poetry install --no-root --no-dev
COPY ./README.md ./pyproject.toml ./poetry.lock* /app/
RUN poetry install --only=main,docker
ADD src /app/src
ADD bot.py /app/
ENV HOST=0.0.0.0
CMD ["python", "bot.py"]
CMD ["nb", "run"]
docker/Dockerfile_with_frontend
+10 -8
View File
@@ -14,16 +14,15 @@ ENV PYTHONFAULTHANDLER=1 \
PATH="$PATH:/runtime/bin" \
PYTHONPATH="$PYTHONPATH:/runtime/lib/python3.10/site-packages" \
# Versions:
POETRY_VERSION=1.2.2
POETRY_VERSION=1.7.1
RUN apt-get update && apt-get install -y build-essential unzip wget python-dev git
RUN pip install "poetry==$POETRY_VERSION"
WORKDIR /src
COPY pyproject.toml poetry.lock /src/
COPY README.md pyproject.toml poetry.lock /src/
RUN poetry add "nonebot2[fastapi]" nonebot-adapter-red nonebot-adapter-qq nonebot-adapter-telegram && \
poetry export --without-hashes --no-interaction --no-ansi -f requirements.txt -o requirements.txt
RUN poetry export --only=main,docker --without-hashes --no-interaction --no-ansi -f requirements.txt -o requirements.txt
RUN pip install --prefix=/runtime --force-reinstall -r requirements.txt
FROM base as runtime
@@ -37,13 +36,16 @@ RUN --mount=type=cache,target=/var/cache/apt \
fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 \
libcairo2 libcups2 libdbus-1-3 libdrm2 libegl1 libgbm1 libglib2.0-0 libgtk-3-0 \
libnspr4 libnss3 libpango-1.0-0 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 \
libxdamage1 libxext6 libxfixes3 libxrandr2 libxshmfence1
libxdamage1 libxext6 libxfixes3 libxrandr2 libxshmfence1 nano
COPY --from=builder /runtime /usr/local
RUN playwright install chromium
ADD . /app/
RUN echo 'DATASTORE_DATA_DIR=/data' > .env
RUN pip install -e . && playwright install chromium
RUN mv docker.env.prod .env.prod && \
nb adapter install nonebot-adapter-red && \
nb adapter install nonebot-adapter-qq && \
nb adapter install nonebot-adapter-telegram
ENV HOST=0.0.0.0
CMD ["python", "bot.py"]
CMD ["nb", "run"]
# vim: ft=dockerfile
docker/Dockerfile_with_frontend_sentry
+10 -9
View File
@@ -14,7 +14,7 @@ ENV PYTHONFAULTHANDLER=1 \
PATH="$PATH:/runtime/bin" \
PYTHONPATH="$PYTHONPATH:/runtime/lib/python3.10/site-packages" \
# Versions:
POETRY_VERSION=1.2.2
POETRY_VERSION=1.7.1
RUN apt-get update && apt-get install -y build-essential unzip wget python3-dev git
RUN pip install "poetry==$POETRY_VERSION"
@@ -22,10 +22,7 @@ WORKDIR /src
COPY pyproject.toml poetry.lock /src/
RUN poetry add "nonebot2[fastapi]" \
nonebot-adapter-red nonebot-adapter-qq nonebot-adapter-telegram \
nonebot-plugin-sentry && \
poetry export --without-hashes --no-interaction --no-ansi -f requirements.txt -o requirements.txt
RUN poetry export --only=main,docker --without-hashes --no-interaction --no-ansi -f requirements.txt -o requirements.txt
RUN pip install --prefix=/runtime --force-reinstall -r requirements.txt
FROM base as runtime
@@ -39,13 +36,17 @@ RUN --mount=type=cache,target=/var/cache/apt \
fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 \
libcairo2 libcups2 libdbus-1-3 libdrm2 libegl1 libgbm1 libglib2.0-0 libgtk-3-0 \
libnspr4 libnss3 libpango-1.0-0 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 \
libxdamage1 libxext6 libxfixes3 libxrandr2 libxshmfence1
libxdamage1 libxext6 libxfixes3 libxrandr2 libxshmfence1 nano
COPY --from=builder /runtime /usr/local
RUN playwright install chromium
ADD . /app/
RUN echo 'DATASTORE_DATA_DIR=/data' > .env && sed '/nonebot.load_builtin_plugins("echo")/a nonebot.load_plugin("nonebot_plugin_sentry")' -i bot.py
RUN pip install -e . && playwright install chromium
RUN mv docker.env.prod .env.prod && \
nb adapter install nonebot-adapter-red && \
nb adapter install nonebot-adapter-qq && \
nb adapter install nonebot-adapter-telegram && \
nb plugin install nonebot-plugin-sentry
ENV HOST=0.0.0.0
CMD ["python", "bot.py"]
CMD ["nb", "run"]
# vim: ft=dockerfile