diff --git a/docker-compose-test.yml b/docker-compose-test.yml index c68da942d..4a2699bd3 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -1,7 +1,7 @@ version: '3' services: postgres-test: - image: "postgres:12.8" + image: "ankane/pgvector:v0.5.1" container_name: "omnivore-postgres-test" environment: - POSTGRES_USER=postgres @@ -16,6 +16,22 @@ services: expose: - 5432 + migrate-test: + build: + context: . + dockerfile: ./packages/db/Dockerfile + container_name: "omnivore-migrate-test" + command: '/bin/sh ./packages/db/setup.sh' # Also create a demo user with email: demo@omnivore.app, password: demo + environment: + - PGPASSWORD=postgres + - PG_HOST=postgres-test + - PG_USER=postgres + - PG_PASSWORD=postgres + - PG_DB=omnivore_test + depends_on: + postgres-test: + condition: service_healthy + api-test: build: context: . @@ -29,14 +45,12 @@ services: - PG_DB=omnivore_test - PG_PORT=5432 - PG_POOL_MAX=20 - - IMAGE_PROXY_URL=http://localhost:9999 - IMAGE_PROXY_SECRET=some-secret - JWT_SECRET=some_secret - SSO_JWT_SECRET=some_sso_secret - CLIENT_URL=http://localhost:3000 - GATEWAY_URL=http://localhost:8080/api - CONTENT_FETCH_URL=http://localhost:9090/ - - REMINDER_TASK_HANDLER_URL=/svc/reminders/trigger - BOOKMARKLET_JWT_SECRET=some_bookmarklet_secret - BOOKMARKLET_VERSION=1.0.0 - PREVIEW_IMAGE_WRAPPER_ID='selected_highlight_wrapper' @@ -46,5 +60,5 @@ services: - SEGMENT_WRITE_KEY='test' - PUBSUB_VERIFICATION_TOKEN='123456' depends_on: - postgres-test: - condition: service_healthy + migrate-test: + condition: service_completed_successfully diff --git a/packages/api/Dockerfile-test b/packages/api/Dockerfile-test index 053375d5e..ff5fa031b 100644 --- a/packages/api/Dockerfile-test +++ b/packages/api/Dockerfile-test @@ -8,6 +8,8 @@ COPY tsconfig.json . COPY /packages/readabilityjs/package.json ./packages/readabilityjs/package.json COPY /packages/api/package.json ./packages/api/package.json +COPY /packages/text-to-speech/package.json ./packages/text-to-speech/package.json +COPY /packages/content-handler/package.json ./packages/content-handler/package.json RUN apk --no-cache --virtual build-dependencies add \ python3 \ @@ -18,8 +20,9 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true RUN yarn install -ADD /packages/db ./packages/db -ADD /packages/readabilityjs ./packages/readabilityjs -ADD /packages/api ./packages/api +COPY /packages/readabilityjs ./packages/readabilityjs +COPY /packages/api ./packages/api +COPY /packages/text-to-speech ./packages/text-to-speech +COPY /packages/content-handler ./packages/content-handler CMD ["yarn", "workspace", "@omnivore/api", "test"]