From 49909e9750321e0023b8db3a433829bd9ecbb162 Mon Sep 17 00:00:00 2001
From: felinae98 <731499577@qq.com>
Date: Sun, 31 Jul 2022 14:37:09 +0800
Subject: [PATCH] update Dockerfile, docker-compose, fix #95

---
 docker-compose.yml                     |  9 ++++-----
 docker/Dockerfile_with_frontend        | 19 ++++++++++++-------
 docker/Dockerfile_with_frontend_sentry | 24 +++++++++++++++---------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e6843ca..2f774bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   go-cqhttp:
-    image: felinae98/go-cqhttp:v1.0.0-beta8-fix2
+    image: silicer/go-cqhttp:v1.0.0-rc3
     volumes:
       - ./bot-data:/data
   nonebot:
@@ -15,10 +15,9 @@ services:
       # SUPERUSERS: '[<your QQ>]'
       BISON_CONFIG_PATH: /data
       # BISON_OUTER_URL: 'http://<your server ip>:8080/bison'
-      BISON_FILTER_LOG: true
-      BISON_USE_PIC: false # 如果需要将文字转为图片发送请改为true
-
-    expose:
+      BISON_FILTER_LOG: 'true'
+      BISON_USE_PIC: 'false' # 如果需要将文字转为图片发送请改为true
+    ports:
       - 8080:8080
     depends_on:
       - go-cqhttp
diff --git a/docker/Dockerfile_with_frontend b/docker/Dockerfile_with_frontend
index d2860b8..903133e 100644
--- a/docker/Dockerfile_with_frontend
+++ b/docker/Dockerfile_with_frontend
@@ -1,17 +1,22 @@
-FROM python:3.9
-RUN python3 -m pip install poetry && poetry config virtualenvs.create false
+# syntax=docker/dockerfile:1.2
+FROM python:3.9 as base
 WORKDIR /app
-RUN apt-get update && apt-get install -y xvfb fonts-noto-color-emoji ttf-unifont \
+RUN --mount=type=cache,target=/root/.cache/pip \
+    python3 -m pip install poetry && poetry config virtualenvs.create false
+RUN --mount=type=cache,target=/var/cache/apt \
+  --mount=type=cache,target=/var/lib/apt \
+    apt-get update && apt-get install -y xvfb fonts-noto-color-emoji ttf-unifont \
     libfontconfig1 libfreetype6 xfonts-cyrillic xfonts-scalable fonts-liberation \
     fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf  \
     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 \
-    && rm -rf /var/lib/apt/lists/*
+    libxdamage1 libxext6 libxfixes3 libxrandr2 libxshmfence1
 COPY ./pyproject.toml ./poetry.lock* /app/
-RUN poetry install --no-dev --no-root
-RUN playwright install chromium
+RUN --mount=type=cache,target=/root/.cache/pypoetry \
+    poetry install --no-dev --no-root
+RUN --mount=type=cache,target=/root/.cache/ms-playwright \
+    playwright install chromium
 ADD src /app/src
 ADD bot.py /app/
 ENV HOST=0.0.0.0
diff --git a/docker/Dockerfile_with_frontend_sentry b/docker/Dockerfile_with_frontend_sentry
index 4844dd2..9e4b98d 100644
--- a/docker/Dockerfile_with_frontend_sentry
+++ b/docker/Dockerfile_with_frontend_sentry
@@ -1,19 +1,25 @@
-FROM python:3.9
-RUN python3 -m pip install poetry && poetry config virtualenvs.create false
+# syntax=docker/dockerfile:1.2
+FROM python:3.9 as base
 WORKDIR /app
-RUN apt-get update && apt-get install -y xvfb fonts-noto-color-emoji ttf-unifont \
+RUN --mount=type=cache,target=/root/.cache/pip \
+    python3 -m pip install poetry && poetry config virtualenvs.create false
+RUN --mount=type=cache,target=/var/cache/apt \
+  --mount=type=cache,target=/var/lib/apt \
+    apt-get update && apt-get install -y xvfb fonts-noto-color-emoji ttf-unifont \
     libfontconfig1 libfreetype6 xfonts-cyrillic xfonts-scalable fonts-liberation \
-    fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf \
+    fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf  \
     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 \
-    && rm -rf /var/lib/apt/lists/*
+    libxdamage1 libxext6 libxfixes3 libxrandr2 libxshmfence1
 COPY ./pyproject.toml ./poetry.lock* ./bot.py /app/
-RUN poetry add nonebot-plugin-sentry && \
+RUN --mount=type=cache,target=/root/.cache/pypoetry \
+    poetry add nonebot-plugin-sentry && \
     sed '/nonebot.load_builtin_plugins("echo")/a nonebot.load_plugin("nonebot_plugin_sentry")' -i bot.py
-RUN poetry install --no-dev --no-root
-RUN playwright install chromium
+RUN --mount=type=cache,target=/root/.cache/pypoetry \
+    poetry install --no-dev --no-root
+RUN --mount=type=cache,target=/root/.cache/ms-playwright \
+    playwright install chromium
 ADD src /app/src
 ENV HOST=0.0.0.0
 CMD ["python", "bot.py"]