Skip to content

Commit 6d0b3c2

Browse files
committed
fix(FQDN): fix rocksdb compile
1 parent ac9e051 commit 6d0b3c2

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

docker/thirdparties-src/Dockerfile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,24 @@
1717

1818
ARG GITHUB_BRANCH=master
1919
ARG OS_VERSION=rockylinux9
20-
FROM apache/pegasus:build-env-${OS_VERSION}-${GITHUB_BRANCH} as base
20+
FROM apache/pegasus:build-env-${OS_VERSION}-${GITHUB_BRANCH} AS base_image
2121

22-
23-
# --- Ubuntu 特有层 ---
24-
FROM base AS stage-ubuntu2004
22+
# --- 环境定义阶段:Ubuntu 2004 专属 ---
23+
FROM base_image AS stage-ubuntu2004
2524
ENV OPENSSL_ROOT_DIR=/usr/local/ssl \
2625
LIBRARY_PATH=/usr/local/ssl/lib64:/usr/local/ssl/lib:$LIBRARY_PATH \
2726
LD_LIBRARY_PATH=/usr/local/ssl/lib64:/usr/local/ssl/lib:$LD_LIBRARY_PATH \
28-
CMAKE_PREFIX_PATH=/usr/local/ssl:$CMAKE_PREFIX_PATH
27+
CMAKE_PREFIX_PATH=/usr/local/ssl:$CMAKE_PREFIX_PATH
2928

30-
# --- 其他系统默认层 ---
31-
FROM base AS stage-rockylinux9
32-
# 不做任何操作
29+
# --- 环境定义阶段:默认其他系统(不设置 ENV) ---
30+
FROM base_image AS stage-rockylinux9
31+
FROM base_image AS stage-ubuntu2204
32+
FROM base_image AS stage-ubuntu1804
3333

34-
# --- 最终编译切换 ---
35-
# 必须再次声明 ARG 才能在 FROM 中使用
36-
ARG OS_VERSION
34+
# --- 最终构建阶段:根据 OS_VERSION 自动指向上述某个 stage ---
3735
FROM stage-${OS_VERSION} AS builder
3836

37+
3938
WORKDIR /root
4039

4140
ARG GITHUB_BRANCH

0 commit comments

Comments
 (0)