From cb3184e9f142c122f48fcf8d664802899cdc78a5 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 28 Aug 2025 20:35:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20Docker=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/continew-admin/Dockerfile | 2 -- docker/docker-compose.yml | 46 +++++++++++++++---------------- docker/redis/data/README.md | 1 - docker/schedule-server/Dockerfile | 2 -- 4 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 docker/redis/data/README.md diff --git a/docker/continew-admin/Dockerfile b/docker/continew-admin/Dockerfile index 64b2ee79..3abe13f7 100644 --- a/docker/continew-admin/Dockerfile +++ b/docker/continew-admin/Dockerfile @@ -3,8 +3,6 @@ # 若对镜像大小有严格要求，可将当前镜像替换为 alpine 版本 FROM bellsoft/liberica-openjdk-debian:17.0.14 -MAINTAINER Charles7c charles7c@126.com - ARG JAR_FILE=./bin/*.jar COPY ${JAR_FILE} /app/bin/app.jar WORKDIR /app/bin diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index dab17e5c..c551850d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,10 +2,13 @@ version: '3' services: mysql: image: mysql:8.0.42 - restart: always container_name: mysql + restart: always ports: - '3306:3306' + volumes: + - /docker/mysql/conf/:/etc/mysql/conf.d/ + - /docker/mysql/data/:/var/lib/mysql/ environment: TZ: Asia/Shanghai MYSQL_ROOT_PASSWORD: 你的root用户密码 @@ -13,9 +16,6 @@ services: MYSQL_DATABASE: continew_admin #MYSQL_USER: 你的数据库用户名 #MYSQL_PASSWORD: 你的数据库密码 - volumes: - - /docker/mysql/conf/:/etc/mysql/conf.d/ - - /docker/mysql/data/:/var/lib/mysql/ command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 @@ -24,37 +24,42 @@ services: --lower_case_table_names=1 # postgresql: # image: postgres:14.2 -# restart: always # container_name: postgresql +# restart: always # ports: # - '5432:5432' +# volumes: +# - /docker/postgresql/data/:/var/lib/postgresql/data/ # environment: # TZ: Asia/Shanghai # POSTGRES_USER: 你的用户名 # POSTGRES_PASSWORD: 你的用户密码 # POSTGRES_DB: continew_admin -# volumes: -# - /docker/postgresql/data/:/var/lib/postgresql/data/ redis: image: redis:7.2.8 - restart: always container_name: redis + restart: always ports: - '6379:6379' - environment: - TZ: Asia/Shanghai volumes: - /docker/redis/conf/redis.conf:/usr/local/redis/config/redis.conf - /docker/redis/data/:/data/ - /docker/redis/logs/:/logs/ - command: 'redis-server /usr/local/redis/config/redis.conf --appendonly yes --requirepass 你的 Redis 密码' + environment: + TZ: Asia/Shanghai + command: 'redis-server /usr/local/redis/config/redis.conf --appendonly yes' continew-server: build: ./continew-admin - restart: always container_name: continew-server + restart: always ports: - '18000:18000' - '1789:1789' + volumes: + - /docker/continew-admin/config/:/app/config/ + - /docker/continew-admin/data/file/:/app/data/file/ + - /docker/continew-admin/logs/:/app/logs/ + - /docker/continew-admin/lib/:/app/lib/ environment: TZ: Asia/Shanghai DB_HOST: 172.17.0.1 @@ -69,36 +74,33 @@ services: SCHEDULE_HOST: 172.17.0.1 SCHEDULE_PORT: 1788 SCHEDULE_TOKEN: 任务调度服务端 Token - volumes: - - /docker/continew-admin/config/:/app/config/ - - /docker/continew-admin/data/file/:/app/data/file/ - - /docker/continew-admin/logs/:/app/logs/ - - /docker/continew-admin/lib/:/app/lib/ depends_on: - redis - mysql continew-web: image: nginx:1.27.0 - restart: always container_name: continew-web + restart: always ports: - '80:80' - '443:443' - environment: - TZ: Asia/Shanghai volumes: - /docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf - /docker/nginx/cert/:/etc/nginx/cert/ - /docker/nginx/logs/:/var/log/nginx/ # 前端页面目录 - /docker/continew-admin/web/:/usr/share/nginx/html/ + environment: + TZ: Asia/Shanghai schedule-server: build: ./schedule-server - restart: always container_name: schedule-server + restart: always ports: - '18001:18001' - '1788:1788' + volumes: + - /docker/schedule-server/logs/:/app/logs/ environment: TZ: Asia/Shanghai DB_HOST: 172.17.0.1 @@ -106,7 +108,5 @@ services: DB_USER: 你的数据库用户名 DB_PWD: 你的数据库密码 DB_NAME: continew_admin_job - volumes: - - /docker/schedule-server/logs/:/app/logs/ depends_on: - mysql diff --git a/docker/redis/data/README.md b/docker/redis/data/README.md deleted file mode 100644 index a7ce096b..00000000 --- a/docker/redis/data/README.md +++ /dev/null @@ -1 +0,0 @@ -Redis 数据存储目录，请确保赋予了读写权限，否则将无法写入数据 \ No newline at end of file diff --git a/docker/schedule-server/Dockerfile b/docker/schedule-server/Dockerfile index ca09aa73..1b3d04bb 100644 --- a/docker/schedule-server/Dockerfile +++ b/docker/schedule-server/Dockerfile @@ -3,8 +3,6 @@ # 若对镜像大小有严格要求，可将当前镜像替换为 alpine 版本 FROM bellsoft/liberica-openjdk-debian:17.0.14 -MAINTAINER Charles7c charles7c@126.com - ARG JAR_FILE=*.jar COPY ${JAR_FILE} /app/bin/app.jar WORKDIR /app/bin