From a1d7105b22ee313e720da9f4a53b815a163b43c6 Mon Sep 17 00:00:00 2001 From: Mike Solar Date: Mon, 21 Sep 2026 13:00:20 +0800 Subject: [PATCH] fix: use full image tag to support podman --- Dockerfile | 4 ++-- docker-compose.yml | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f7c9a7..558bdea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # ===================================================================== # ---------- 构建阶段 ---------- -FROM maven:3.9-eclipse-temurin-21 AS build +FROM docker.io/library/maven:3.9-eclipse-temurin-21 AS build WORKDIR /build # 先只复制 pom,利用 Docker 层缓存预热依赖 @@ -19,7 +19,7 @@ RUN mvn -B -q -Dmaven.test.skip=true package \ && cp target/*.jar /build/app.jar # ---------- 运行阶段 ---------- -FROM eclipse-temurin:21-jre +FROM docker.io/library/eclipse-temurin:21-jre WORKDIR /opt/app # 以非 root 用户运行 diff --git a/docker-compose.yml b/docker-compose.yml index b4d1311..b784ec2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ name: lab-reservation services: # ---------- 数据库:MariaDB 11 ---------- mariadb: - image: mariadb:11.4 + image: docker.io/library/mariadb:11.4 container_name: lab-mariadb restart: unless-stopped environment: @@ -31,7 +31,7 @@ services: - --collation-server=utf8mb4_unicode_ci volumes: # 数据库数据持久化;首次启动由后端自动建表并写入演示数据 - - mariadb-data:/var/lib/mysql + - ${DATA_DIR:-./mariadb-data}:/var/lib/mysql # 需要本地客户端连库调试时可打开端口映射 # ports: # - "3306:3306" @@ -88,10 +88,6 @@ services: networks: - lab-net -volumes: - # 命名卷保存 MariaDB 数据;docker compose down -v 可连同数据一起清理 - mariadb-data: - networks: lab-net: driver: bridge