From 176d5eb06bf68419723dd1c17275a5e6eb2b9cdf Mon Sep 17 00:00:00 2001
From: dal <dallinbentley98@gmail.com>
Date: Tue, 7 Jan 2025 15:43:31 -0700
Subject: [PATCH] Refactor Docker Compose and API Dockerfile for improved
 environment handling

- Removed version specification from `docker-compose.yml` for simplicity.
- Eliminated the `env_file` directive in the `web` service to streamline environment variable management.
- Updated the `Dockerfile` for the API to conditionally copy SSL certificates based on the environment, enhancing flexibility for local and production setups.

These changes aim to simplify the configuration and improve the development workflow.
---
 api/Dockerfile     | 7 +++++--
 docker-compose.yml | 4 ----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index 69415b764..3a8667561 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -22,8 +22,11 @@ RUN apt-get update && apt-get install -y \
     && update-ca-certificates \
     && rm -rf /var/lib/apt/lists/*
 
-COPY cert.pem /usr/local/share/ca-certificates/cert.crt
-RUN update-ca-certificates
+ARG ENVIRONMENT=local
+RUN if [ "$ENVIRONMENT" != "local" ]; then \
+    COPY cert.pem /usr/local/share/ca-certificates/cert.crt && \
+    update-ca-certificates; \
+    fi
 
 COPY --from=builder /app/target/release/bi_api .
 EXPOSE 3001
diff --git a/docker-compose.yml b/docker-compose.yml
index 4c3701417..c74392752 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   db:
     image: supabase/postgres:15.1.0.117
@@ -31,8 +29,6 @@ services:
       - "3000:3000"
     environment:
       - NODE_ENV=production
-    env_file:
-      - ./web/.env
     depends_on:
       - api