From 3df8fcacbc67599de90bc4cfbf9720b954cd007c Mon Sep 17 00:00:00 2001 From: shiran <2488252513@qq.com> Date: Sat, 9 May 2026 17:14:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(config):=20=E6=B7=BB=E5=8A=A0=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E7=89=88=E6=9C=AC=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为 Docker 镜像添加可配置的环境变量,包括 PostGIS、Redis、MinIO 和 Nginx, 使镜像版本可以通过 .env 文件进行自定义配置。 BREAKING CHANGE: 现在需要在 .env 文件中设置镜像版本变量。 --- .env.example | 4 ++++ docker-compose.yml | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index 29e9178..356ccb1 100644 --- a/.env.example +++ b/.env.example @@ -1,13 +1,16 @@ # PostgreSQL +POSTGRES_IMAGE=postgis/postgis:17-3.5 POSTGRES_USER=shiran POSTGRES_PASSWORD=change-me-postgres-password POSTGRES_DB=ciyuan_viewfinder POSTGRES_PGDATA=/var/lib/postgresql/data/pgdata # Redis +REDIS_IMAGE=redis:7-alpine REDIS_URL=redis://redis:6379/0 # MinIO / S3 +MINIO_IMAGE=minio/minio:latest MINIO_ROOT_USER=minioadmin MINIO_ROOT_PASSWORD=change-me-minio-password S3_ENDPOINT=http://minio:9000 @@ -31,5 +34,6 @@ LOG_JSON=false VITE_API_BASE=/api/v1 # Nginx host ports +NGINX_IMAGE=nginx:1.27-alpine CLIENT_WEB_PORT=5173 ADMIN_WEB_PORT=5174 diff --git a/docker-compose.yml b/docker-compose.yml index cc42105..5e87e95 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: postgres: - image: postgis/postgis:17-3.5 + image: "${POSTGRES_IMAGE}" container_name: ciyuan-postgres environment: POSTGRES_USER: "${POSTGRES_USER}" @@ -25,7 +25,7 @@ services: - ciyuan-net redis: - image: redis:7-alpine + image: "${REDIS_IMAGE}" container_name: ciyuan-redis expose: - "6379" @@ -41,7 +41,7 @@ services: - ciyuan-net minio: - image: minio/minio:latest + image: "${MINIO_IMAGE}" container_name: ciyuan-minio command: server /data --console-address ":9001" environment: @@ -132,7 +132,7 @@ services: - ciyuan-net nginx: - image: nginx:1.27-alpine + image: "${NGINX_IMAGE}" container_name: ciyuan-nginx ports: - "${CLIENT_WEB_PORT}:80"