Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

Remove DATABASE_URL from Dockerfile (#328)

Lars Haalckd4bebbc0f2b8
diff --git a/Dockerfile b/Dockerfile
index 03d0af2ef..76cfa4d8f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,16 +12,14 @@ COPY . .
RUN yarn build
-FROM node:alpine
+FROM node:alpine
ENV PORT 3000
EXPOSE 3000
-ARG DATABASE_URL
-ENV DATABASE_URL $DATABASE_URL
-
WORKDIR /usr/src/app
COPY --from=build /app .
+COPY docker_start.sh .
-CMD sh -c "yarn prisma migrate deploy --schema prisma/schema.prisma && yarn start"
\ No newline at end of file
+ENTRYPOINT [ "./docker_start.sh" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index cf4d9d88b..023dfcb34 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.3"
+version: "3.9"
services:
rallly_db:
image: postgres:14.2
@@ -7,15 +7,20 @@ services:
- db-data:/var/lib/postgresql/data
environment:
- POSTGRES_PASSWORD=postgres
+ - POSTGRES_DB=db
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -U postgres"]
+ interval: 5s
+ timeout: 5s
+ retries: 5
rallly:
build:
context: .
- args:
- - DATABASE_URL=postgres://postgres:postgres@rallly_db:5432/db?pgbouncer=true
restart: always
depends_on:
- - rallly_db
+ rallly_db:
+ condition: service_healthy
ports:
- 3000:3000
environment:
diff --git a/docker_start.sh b/docker_start.sh
new file mode 100755
index 000000000..7c3c0a2d2
--- /dev/null
+++ b/docker_start.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+yarn prisma migrate deploy --schema prisma/schema.prisma
+yarn start