diff --git a/.env.example b/.env.example index 352653e..673d2bd 100644 --- a/.env.example +++ b/.env.example @@ -1,2 +1,7 @@ GITHUB_CLIENT_ID="YOUR_GITHUB_CLIENT_ID" GITHUB_CLIENT_SECRET="YOUR_GITHUB_CLIENT_SECRET" + +DATABASE_URL: postgresql://DATABASE_USERNAME:DATABASE_PASSWORD@postgres:5432/DATABASE_NAME +POSTGRES_USER: DATABASE_USERNAME +POSTGRES_PASSWORD: DATABASE_PASSWORD +POSTGRES_DB: POSTGRES_DB \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 236b6bd..047e603 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . EXPOSE 8000 -CMD ["uvicorn","app.main:app","--host","0.0.0.0","--port","8000"] \ No newline at end of file +CMD ["uvicorn","bloom.main:app","--host","0.0.0.0","--port","8000"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index fe0b915..9c44be0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,22 +4,18 @@ services: build: context: . dockerfile: Dockerfile - args: - - IMAGE_TAG=$${{ secrets.DOCKER_HUB_USERNAME }}/bloom-backend depends_on: - postgres container_name: bloom-backend ports: - - "8000:8000" - environment: - - DATABASE_URL=postgresql://$${{ secrets.DATABASE_USERNAME }}:$${{ secrets.DATABASE_PASSWORD }}@postgres:5432/$${{ secrets.DATABASE_NAME }} + - "8000:8000" + env_file: + - .env postgres: image: postgres:latest - environment: - POSTGRES_USER: $${{ secrets.DATABASE_USERNAME }} - POSTGRES_PASSWORD: $${{ secrets.DATABASE_PASSWORD }} - POSTGRES_DB: $${{ secrets.POSTGRES_DB }} + env_file: + - .env ports: - "5432:5432" volumes: