Skip to content

Commit 4fdcee9

Browse files
committed
chore: 优化镜像本地构建
1 parent 725384f commit 4fdcee9

File tree

5 files changed

+89
-38
lines changed

5 files changed

+89
-38
lines changed

Dockerfile.base

Lines changed: 0 additions & 25 deletions
This file was deleted.

app/tg-bot/Dockerfile

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,36 @@
1-
FROM localhost/open-sol-bot-base:latest
1+
# Build base image first
2+
FROM python:3.10-slim as builder
3+
4+
# Set environment variables
5+
ENV PYTHONUNBUFFERED=1 \
6+
PDM_USE_VENV=false \
7+
PDM_INSTALL_PATH=/app \
8+
PROJECT_ROOT=/app
9+
10+
# Install system dependencies
11+
RUN apt-get update && apt-get install -y \
12+
build-essential \
13+
curl \
14+
git \
15+
libssl-dev \
16+
pkg-config \
17+
&& rm -rf /var/lib/apt/lists/*
18+
19+
# Install PDM
20+
RUN curl -sSL https://pdm.fming.dev/install-pdm.py | python3 - && \
21+
ln -s /root/.local/bin/pdm /usr/bin/pdm
22+
23+
WORKDIR /app
24+
25+
# Create necessary directories
26+
RUN mkdir -p /app/libs /app/logs
27+
28+
# Build final image
29+
FROM builder as final
230

331
# Install dependencies
432
COPY ./libs /app/libs
5-
COPY ./app/trading/pyproject.toml /app/
33+
COPY ./app/tg-bot/pyproject.toml /app/
634
RUN pdm config python.use_venv false && \
735
pdm install -G local
836

app/trading/Dockerfile

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
1-
FROM localhost/open-sol-bot-base:latest
1+
# Build base image first
2+
FROM python:3.10-slim as builder
3+
4+
# Set environment variables
5+
ENV PYTHONUNBUFFERED=1 \
6+
PDM_USE_VENV=false \
7+
PDM_INSTALL_PATH=/app \
8+
PROJECT_ROOT=/app
9+
10+
# Install system dependencies
11+
RUN apt-get update && apt-get install -y \
12+
build-essential \
13+
curl \
14+
git \
15+
libssl-dev \
16+
pkg-config \
17+
&& rm -rf /var/lib/apt/lists/*
18+
19+
# Install PDM
20+
RUN curl -sSL https://pdm.fming.dev/install-pdm.py | python3 - && \
21+
ln -s /root/.local/bin/pdm /usr/bin/pdm
22+
23+
WORKDIR /app
24+
25+
# Create necessary directories
26+
RUN mkdir -p /app/libs /app/logs
27+
28+
# Build final image
29+
FROM builder as final
230

331
# Install dependencies
432
COPY ./libs /app/libs

app/wallet-tracker/Dockerfile

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,36 @@
1-
FROM localhost/open-sol-bot-base:latest
1+
# Build base image first
2+
FROM python:3.10-slim as builder
3+
4+
# Set environment variables
5+
ENV PYTHONUNBUFFERED=1 \
6+
PDM_USE_VENV=false \
7+
PDM_INSTALL_PATH=/app \
8+
PROJECT_ROOT=/app
9+
10+
# Install system dependencies
11+
RUN apt-get update && apt-get install -y \
12+
build-essential \
13+
curl \
14+
git \
15+
libssl-dev \
16+
pkg-config \
17+
&& rm -rf /var/lib/apt/lists/*
18+
19+
# Install PDM
20+
RUN curl -sSL https://pdm.fming.dev/install-pdm.py | python3 - && \
21+
ln -s /root/.local/bin/pdm /usr/bin/pdm
22+
23+
WORKDIR /app
24+
25+
# Create necessary directories
26+
RUN mkdir -p /app/libs /app/logs
27+
28+
# Build final image
29+
FROM builder as final
230

331
# Install dependencies
432
COPY ./libs /app/libs
5-
COPY ./app/trading/pyproject.toml /app/
33+
COPY ./app/wallet-tracker/pyproject.toml /app/
634
RUN pdm config python.use_venv false && \
735
pdm install -G local
836

docker-compose.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
services:
2-
base:
3-
build:
4-
context: .
5-
dockerfile: Dockerfile.base
6-
image: localhost/open-sol-bot-base:latest
7-
82
wallet-tracker:
93
build:
104
context: .
@@ -18,8 +12,6 @@ services:
1812
- PYTHONPATH=/app/libs:/app
1913
command: ["wallet_tracker.main"]
2014
depends_on:
21-
base:
22-
condition: service_completed_successfully
2315
mysql:
2416
condition: service_healthy
2517
redis:

0 commit comments

Comments
 (0)