fix: Dockerfile build arg for prisma generate + cleanup deploy
Some checks failed
Deploy API Server / build-and-deploy (push) Failing after 1m42s

- Add ARG DATABASE_URL to Dockerfile so prisma generate works at build time
- Fix env file path (/opt/zhixi/env/ not /etc/zhixi/)
- Fix MySQL container name (mysql, not mysql-zhixi)
- Use correct DB name (zhixi_prod)
- Prevent duplicate mysql/redis containers from docker compose

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
WangDL 2026-05-20 17:25:35 +08:00
parent c64dc9c95a
commit 1fb6dd4929
2 changed files with 8 additions and 10 deletions

View File

@ -30,19 +30,14 @@ jobs:
# Create network if missing
docker network inspect zhixi-net >/dev/null 2>&1 || docker network create zhixi-net
# Start MySQL + Redis via docker compose (try common locations)
for dir in /opt/zhixi /root/zhixi /tmp/api-server; do
if [ -f "$dir/docker-compose.yml" ]; then
cd "$dir" && docker compose up -d mysql redis 2>/dev/null || true
break
fi
done
sleep 5
# MySQL + Redis + Qdrant are managed independently (systemd/docker run)
docker start mysql redis qdrant 2>/dev/null || true
sleep 3
- name: Resolve failed migrations
run: |
MYSQL_PASS=$(docker exec mysql-zhixi printenv MYSQL_PASSWORD 2>/dev/null || echo "Zhixi@2026!App")
MYSQL_CMD="docker exec mysql-zhixi mysql -u zhixi_user -p${MYSQL_PASS} zhixi"
MYSQL_PASS="hKHQ+N0wBjJAiLukFu5OMEI8"
MYSQL_CMD="docker exec mysql mysql -u zhixi_user -p${MYSQL_PASS} zhixi_prod"
# Check for failed/stuck migrations
FAILED=$($MYSQL_CMD -N -e \

View File

@ -4,6 +4,9 @@ WORKDIR /app
RUN apk add --no-cache openssl
ARG DATABASE_URL="mysql://placeholder:placeholder@localhost:3306/placeholder"
ENV DATABASE_URL=$DATABASE_URL
COPY package.json package-lock.json ./
RUN npm ci