From 06503392851455cab7e1350367a27b0521c44082 Mon Sep 17 00:00:00 2001 From: Camerin Figueroa Date: Fri, 3 May 2024 00:46:49 +0000 Subject: [PATCH] Updated Docker compose and docker image to pass DATABASE_URL as environment var to Request Mirror --- .gitignore | 2 +- Dockerfile | 2 +- docker-compose.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 80dba80..2f5cb03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /target -.env.local \ No newline at end of file +export.sh \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index d3064ae..a8dfbcd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,4 +13,4 @@ COPY .env.docker /.env ENV ROCKET_ADDRESS=0.0.0.0 ENV ROCKET_ENV=production EXPOSE 8000 -ENTRYPOINT diesel migration run --migration-dir /migrations && request-mirror \ No newline at end of file +ENTRYPOINT diesel migration run --database-url $DATABASE_URL --migration-dir /migrations && request-mirror \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c564ed6..c934e54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: image: postgres environment: - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=password + - POSTGRES_PASSWORD=Password123 - POSTGRES_DB=request_mirror_db volumes: - db-data:/var/lib/postgresql/data @@ -21,7 +21,7 @@ services: ports: - 80:8000 environment: - - DATABASE_URL=postgres://postgres:password@postgres/request_mirror_db + - DATABASE_URL=postgres://postgres:Password123@postgres/request_mirror_db depends_on: postgres: condition: service_healthy