diff --git a/Docker/scripts/deploy_database.sh b/Docker/scripts/deploy_database.sh old mode 100644 new mode 100755 index 4b08b5e8..5a61deb1 --- a/Docker/scripts/deploy_database.sh +++ b/Docker/scripts/deploy_database.sh @@ -8,8 +8,8 @@ fi if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" ]]; then export DATABASE_URL - echo "Database URL: $DATABASE_URL" - ./node_modules/.bin/prisma generate --schema=prisma/$DATABASE_PROVIDER-schema.prisma + ./node_modules/.bin/prisma migrate deploy --schema=prisma/$DATABASE_PROVIDER-schema.prisma + ./node_modules/.bin/prisma generate --schema=prisma/$DATABASE_PROVIDER-schema.prisma else echo "Error: Database provider $DATABASE_PROVIDER invalid." exit 1 diff --git a/Docker/scripts/generate_database.sh b/Docker/scripts/generate_database.sh new file mode 100644 index 00000000..4b08b5e8 --- /dev/null +++ b/Docker/scripts/generate_database.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +source ./Docker/scripts/env_functions.sh + +if [ "$DOCKER_ENV" != "true" ]; then + export_env_vars +fi + +if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" ]]; then + export DATABASE_URL + echo "Database URL: $DATABASE_URL" + ./node_modules/.bin/prisma generate --schema=prisma/$DATABASE_PROVIDER-schema.prisma +else + echo "Error: Database provider $DATABASE_PROVIDER invalid." + exit 1 +fi diff --git a/Dockerfile b/Dockerfile index 670b7a70..4194ca45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN chmod +x ./Docker/scripts/* ENV DATABASE_CONNECTION_URI=postgres://postgres:pass@localhost/evolution -RUN ./Docker/scripts/deploy_database.sh +RUN ./Docker/scripts/generate_database.sh RUN npm run build @@ -50,4 +50,4 @@ COPY --from=builder /evolution . ENV DOCKER_ENV=true -ENTRYPOINT ["/bin/bash", "-c", ". ./scripts/run_database_operation_deploy.sh && npm run start:prod" ] +ENTRYPOINT ["/bin/bash", "-c", ". ./Docker/scripts/deploy_database.sh && npm run start:prod" ]