diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index cb0507d..ed9d284 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -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 \ diff --git a/Dockerfile b/Dockerfile index bcb8786..81d054e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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