dockerfile & docker-compose

README.md

@@ -101,6 +101,18 @@ ps: 虽然我知道，大部分人都是来了**直接下载源代码**后就潇
 
 # 快速开始
 
+## Docker Compose（推荐）
+
+1. 在任意位置下分别创建 `.env` 和 `docker-compose.yml`（可以参考或直接复制`docs/docker/docker-compose-prod.yml`的内容） 文件
+2. 执行 `docker-compose -p oneblog up -d`
+
+## Docker Compose
+
+1. 打包项目 `mvn clean package -Dmaven.test.skip=true -Pdev`
+2. 进入 `docs/docker` 目录
+3. 按照注释修改 `.env` 文件
+4. 执行 `docker-compose -p oneblog up -d`
+
 ## 源码方式
 
 > `blog-web` 和 `blog-admin` 的运行方式一样
@@ -118,21 +130,6 @@ ps: 虽然我知道，大部分人都是来了**直接下载源代码**后就潇
 
 > 后台默认账号密码：root/123456
 
-## Docker Compose
-
-1. 打包项目 `mvn clean package -Dmaven.test.skip=true -Pdev`
-2. 进入 `docs/docker` 目录
-3. 按照注释修改 `.env` 文件
-4. 执行 `docker-compose -p oneblog up -d`
-
-
-# 后续扩展
-- [ ] 1. 页面缓存
-- [ ] 2. cc防护
-- [ ] 3. 配套小程序
-- [ ] 4. 待续...
-...
-
 # Who is using?
 
 烦请各位使用 OneBlog 的朋友，能留下你的网址 - [点这儿](https://gitee.com/yadong.zhang/DBlog/issues/ILIAQ)

docs/docker/docker-compose-prod.yml

+# 使用构建好的镜像运行
+# 官方稳定版
+version: '3.3'
+services:
+
+  # Redis
+  blog-redis:
+    image: redis
+    restart: always
+    container_name: blog-redis
+    hostname: blog-redis
+    command: redis-server --appendonly yes --requirepass ${ONEBLOG_REDIS_PASSWORD} --bind blog-redis
+    ports:
+      - 63799:6379
+    volumes:
+      - ${ONEBLOG_APP_DIR}/redis/:/data/
+    healthcheck:
+      test: [ "CMD", "redis-cli" ]
+      timeout: 20s
+      retries: 10
+    networks:
+      - oneblog
+
+  # MySQL
+  blog-mysql:
+    image: justauth/blog-mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: ${ONEBLOG_DATASOURCE_PASSWORD}
+      TZ: Asia/Shanghai
+    restart: always
+    container_name: blog-mysql
+    hostname: blog-mysql
+    volumes:
+      - ${ONEBLOG_APP_DIR}/mysql:/var/lib/mysql
+    ports:
+      - 33066:3306
+    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      timeout: 20s
+      retries: 10
+    networks:
+      - oneblog
+
+  # admin 服务
+  blog-admin:
+    image: justauth/blog-admin
+    restart: always
+    container_name: blog-admin
+    hostname: blog-admin
+    environment:
+      ONEBLOG_REDIS_DATABASE_INDEX:
+      ONEBLOG_REDIS_HOST:
+      ONEBLOG_REDIS_PORT:
+      ONEBLOG_REDIS_PASSWORD:
+      ONEBLOG_DATASOURCE_HOST:
+      ONEBLOG_DATASOURCE_PORT:
+      ONEBLOG_DATASOURCE_DATABASE_NAME:
+      ONEBLOG_DATASOURCE_USERNAME:
+      ONEBLOG_DATASOURCE_PASSWORD:
+      ONEBLOG_MAIL_HOST:
+      ONEBLOG_MAIL_PORT:
+      ONEBLOG_MAIL_USERNAME:
+      ONEBLOG_MAIL_PASSWORD:
+      ONEBLOG_APP_ENABLE_KAPTCHA:
+      ONEBLOG_APP_ENABLE_CONFIGLOG:
+    volumes:
+      - ${ONEBLOG_APP_DIR}:/var/tmp/oneblog
+    depends_on:
+      blog-redis:
+        condition: service_healthy
+      blog-mysql:
+        condition: service_healthy
+    links:
+      - blog-redis
+      - blog-mysql
+    ports:
+      - 8085:8085
+    networks:
+      - oneblog
+
+  # admin 服务
+  blog-web:
+    image: justauth/blog-web
+    restart: always
+    container_name: blog-web
+    hostname: blog-web
+    environment:
+      ONEBLOG_REDIS_DATABASE_INDEX:
+      ONEBLOG_REDIS_HOST:
+      ONEBLOG_REDIS_PORT:
+      ONEBLOG_REDIS_PASSWORD:
+      ONEBLOG_DATASOURCE_HOST:
+      ONEBLOG_DATASOURCE_PORT:
+      ONEBLOG_DATASOURCE_DATABASE_NAME:
+      ONEBLOG_DATASOURCE_USERNAME:
+      ONEBLOG_DATASOURCE_PASSWORD:
+      ONEBLOG_MAIL_HOST:
+      ONEBLOG_MAIL_PORT:
+      ONEBLOG_MAIL_USERNAME:
+      ONEBLOG_MAIL_PASSWORD:
+      ONEBLOG_APP_ENABLE_KAPTCHA:
+      ONEBLOG_APP_ENABLE_CONFIGLOG:
+    volumes:
+      - ${ONEBLOG_APP_DIR}:/var/tmp/oneblog
+    depends_on:
+      blog-redis:
+        condition: service_healthy
+      blog-mysql:
+        condition: service_healthy
+    links:
+      - blog-redis
+      - blog-mysql
+    ports:
+      - 8443:8443
+    networks:
+      - oneblog
+
+networks:
+  oneblog:
+    driver: bridge

docs/docker/docker-compose.yml

+# 通过本地编译的形式运行
+# 可以随时修改源代码后 repackage 然后重新构建本地镜像
 version: '3.3'
 services: