Create container-build.yml

.env.example

@@ -1,3 +1,7 @@
+# Base URL for the API
+FASTAPI_BASE_URL = 1. With Docker: "http://web:8000", 2. Local: "http://localhost:8000"
+LOG_LEVEL = "info"
+
 # User needs to add their Enphase API details
 ENPHASE_SYSTEM_ID = 'user_enphase_system_id'
 ENPHASE_CLIENT_ID = 'user_enphase_client_id'

.github/workflows/container-build.yml

@@ -0,0 +1,57 @@
+name: Create and publish Container image
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
+            type=ref,event=pr
+            type=edge
+            type=sha
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          platforms: linux/amd64,linux/arm64
+          context: .
+          file: Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -4,20 +4,14 @@ FROM python:3.11-slim
 # Set the working directory in the container
 WORKDIR /app
 
-# Copy the requirements.txt file
-COPY requirements.txt .
-
-# Install any needed packages specified in requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
-
 # Copy the entire project directory (including quartz_solar_forecast)
 COPY . /app
 
 # Install the quartz_solar_forecast package in editable mode
-RUN pip install -e .
+RUN pip install .
 
-# Expose port 8000 to the outside world
-EXPOSE 8000
+# Expose port 8000 and 8501 to the outside world
+EXPOSE 8000 8501
 
-# Run the application using python main.py
-CMD ["python", "api/main.py"]
+# The CMD will be provided by docker-compose.yml
+CMD ["sh", "-c", "$CMD"]

api/app/api.py

@@ -28,6 +28,10 @@
     allow_headers=["*"]
 )
 
+@app.get("/health")
+async def root():
+    return {"status": "ok"}
+
 @app.post("/forecast/")
 def forecast(forecast_request: ForecastRequest):
     site = forecast_request.site

dashboards/dashboard_2/app.py

@@ -20,7 +20,7 @@
     st.session_state.redirect_url = ""
 
 # Set up the base URL for the FastAPI server
-FASTAPI_BASE_URL = "http://localhost:8000"
+FASTAPI_BASE_URL = os.getenv("FASTAPI_BASE_URL")
 
 # Get the directory of the current script
 script_dir = os.path.dirname(os.path.abspath(__file__))

docker-compose.yaml

@@ -1,5 +1,5 @@
 x-shared_environment: &shared_environment
-  LOG_LEVEL: ${LOG_LEVEL:-info}
+  LOG_LEVEL: ${LOG_LEVEL}
 
 services:
   open-meteo-api:
@@ -28,17 +28,42 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: fastapi-app
+    container_name: quartz-solar-forecast-api
     ports:
       - "8000:8000"
     env_file:
       - .env
     volumes:
       - .:/app
-    depends_on:
-      - open-meteo-api
-      - open-meteo-sync
     restart: always
+    environment:
+      <<: *shared_environment
+    command: python api/main.py
+    healthcheck:
+      test: ["CMD", "python", "-c", "import requests; requests.get('http://localhost:8000/health')"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+
+  streamlit:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: quartz-solar-forecast-frontend
+    ports:
+      - "8501:8501"
+    volumes:
+      - .:/app
+    working_dir: /app
+    restart: always
+    environment:
+      <<: *shared_environment
+      FASTAPI_BASE_URL: ${FASTAPI_BASE_URL}
+    command: streamlit run dashboards/dashboard_2/app.py
+    depends_on:
+      web:
+        condition: service_healthy
 
 volumes:
-  data:
+  data: