From 8a0155dab8651c0deca4a65b265879e36b731674 Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Sun, 19 Feb 2023 10:09:45 +0100 Subject: [PATCH] :green_heart: Build docker images for postgresql only Still need to find a way to change the database provider at runtime. For now let's just only enable postgresql for docker deployments Closes #324 --- .github/workflows/publish_docker_images.yml | 2 ++ apps/docs/docs/self-hosting/planetscale.md | 4 ++++ builder-entrypoint.sh | 10 ++-------- viewer-entrypoint.sh | 6 +----- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish_docker_images.yml b/.github/workflows/publish_docker_images.yml index a233934aa..bc6580a15 100644 --- a/.github/workflows/publish_docker_images.yml +++ b/.github/workflows/publish_docker_images.yml @@ -10,6 +10,8 @@ on: jobs: build: + env: + DATABASE_URL: 'postgresql://' strategy: matrix: app: ['builder', 'viewer'] diff --git a/apps/docs/docs/self-hosting/planetscale.md b/apps/docs/docs/self-hosting/planetscale.md index e4f7d24b0..7029f453a 100644 --- a/apps/docs/docs/self-hosting/planetscale.md +++ b/apps/docs/docs/self-hosting/planetscale.md @@ -7,3 +7,7 @@ To do so, follow these instructions: 1. Copy `packages/db/.env.example` to `packages/db/.env` and replace `DATABASE_URL` with a development branch 2. From the `packages/db` directory, run a the db push command: `pnpm run db:push` 3. Then, in Planetscale dashboard, or using their CLI, you can create a new deploy request from this development branch to your production branch. + +:::note +You can't connect to Planetscale database if you are deploying with Docker as docker images are currently built only with postgresql support. +::: diff --git a/builder-entrypoint.sh b/builder-entrypoint.sh index 74d8b707d..d4bf45506 100644 --- a/builder-entrypoint.sh +++ b/builder-entrypoint.sh @@ -2,18 +2,12 @@ ENVSH_ENV=./apps/builder/.env.production ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh -if [[ $DATABASE_URL == postgresql://* ]]; then - ./node_modules/.bin/prisma generate --schema=packages/db/postgresql/schema.prisma; -else - ./node_modules/.bin/prisma generate --schema=packages/db/mysql/schema.prisma; -fi +./node_modules/.bin/prisma generate --schema=packages/db/postgresql/schema.prisma; echo 'Waiting 5s for db to be ready...'; sleep 5; -if [[ $DATABASE_URL == postgresql://* ]]; then - ./node_modules/.bin/prisma migrate deploy --schema=packages/db/postgresql/schema.prisma; -fi +./node_modules/.bin/prisma migrate deploy --schema=packages/db/postgresql/schema.prisma; node apps/builder/server.js; \ No newline at end of file diff --git a/viewer-entrypoint.sh b/viewer-entrypoint.sh index 21671cf35..ab15e281a 100644 --- a/viewer-entrypoint.sh +++ b/viewer-entrypoint.sh @@ -2,10 +2,6 @@ ENVSH_ENV=./apps/viewer/.env.production ENVSH_OUTPUT=./apps/viewer/public/__env.js bash env.sh -if [[ $DATABASE_URL == postgresql://* ]]; then - ./node_modules/.bin/prisma generate --schema=packages/db/postgresql/schema.prisma; -else - ./node_modules/.bin/prisma generate --schema=packages/db/mysql/schema.prisma; -fi +./node_modules/.bin/prisma generate --schema=packages/db/postgresql/schema.prisma; node apps/viewer/server.js; \ No newline at end of file