diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 9 | ||||
| -rw-r--r-- | docker/docker-compose.yml | 17 |
2 files changed, 10 insertions, 16 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 265235a5..7e439a45 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,6 +14,12 @@ ENV NEXT_TELEMETRY_DISABLED 1 ENV PUPPETEER_SKIP_DOWNLOAD true RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile +# Build the db migration script +RUN cd packages/db && \ + pnpm dlx @vercel/ncc build migrate.ts -o /db_migrations && \ + cp -R drizzle /db_migrations + + ################# The Web builder ############## # Rebuild the source code only when needed @@ -33,6 +39,7 @@ ENV NEXT_TELEMETRY_DISABLED 1 COPY --from=web_builder --chown=node:node /app/packages/web/.next/standalone ./ COPY --from=web_builder /app/packages/web/public ./packages/web/public +COPY --from=web_builder /db_migrations /db_migrations # Set the correct permission for prerender cache RUN mkdir -p ./package/web/.next @@ -52,7 +59,7 @@ ENV HOSTNAME "0.0.0.0" # server.js is created by next build from the standalone output # https://nextjs.org/docs/pages/api-reference/next-config-js/output -CMD ["node", "server.js"] +CMD ["/bin/sh", "-c", "(cd /db_migrations && node index.js) && node server.js"] ################# The workers builder ############## diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ed9fb99d..e0da095c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -9,9 +9,6 @@ services: environment: REDIS_HOST: redis DATABASE_URL: "file:/data/db.db" - depends_on: - migration: - condition: service_completed_successfully redis: image: redis:7.2-alpine volumes: @@ -25,18 +22,8 @@ services: DATABASE_URL: "file:/data/db.db" # OPENAI_API_KEY: ... depends_on: - migration: - condition: service_completed_successfully - migration: - image: ghcr.io/mohamedbassem/hoarder-workers:latest - environment: - DATABASE_URL: "file:/data/db.db" - volumes: - - data:/data - command: - - /bin/sh - - -c - - "cd /app/packages/db && pnpm run migrate" + web: + condition: service_started volumes: redis: |