Sync from GitHub via hub-sync

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-slim
+FROM python:3.11-slim AS app
 
 ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1 \
@@ -6,9 +6,6 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONPATH=/app/src \
     FACEVERIFICATION_DEVICE=cpu
 
-ARG APP_VARIANT=gradio
-ENV APP_VARIANT=${APP_VARIANT}
-
 WORKDIR /app
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -31,8 +28,8 @@ USER appuser
 
 EXPOSE 8000 7860
 
-CMD if [ "$APP_VARIANT" = "fastapi" ]; then \
-        exec uvicorn faceverification.interfaces.fastapi_app:app --host 0.0.0.0 --port 8000; \
-    else \
-        exec python -m faceverification.interfaces.gradio_app; \
-    fi
+FROM app AS fastapi
+CMD ["uvicorn", "faceverification.interfaces.fastapi_app:app", "--host", "0.0.0.0", "--port", "8000"]
+
+FROM app AS gradio
+CMD ["python", "-m", "faceverification.interfaces.gradio_app"]

README.md

@@ -156,7 +156,9 @@ docker compose --profile gradio up --build
 
 The Gradio UI will be available at http://localhost:7860.
 
-Both services are built from the same `Dockerfile` with different variants:
+Both services are built from the same `Dockerfile`. The heavy application
+layers live in the shared `app` stage; the `fastapi` and `gradio` stages only
+set different default commands:
 
 - `fastapi`: published to GHCR by the container workflow.
 - `gradio`: used by the Hugging Face Docker Space.
@@ -240,16 +242,6 @@ FACEVERIFICATION_DEMO_PASSWORD
 FACEVERIFICATION_JWT_SECRET_KEY
 ```
 
-Optional GitHub repository secrets for private GHCR packages:
-
-```text
-GHCR_PULL_USERNAME
-GHCR_PULL_TOKEN
-```
-
-If the GHCR package is public, those optional secrets can be omitted. If it is
-private, `GHCR_PULL_TOKEN` must be a GitHub token with package read access.
-
 To avoid ongoing cost while keeping the OIDC and RBAC setup intact, remove the
 demo resources inside the configured resource group from Azure when they are no
 longer needed.

docker-compose.yml

@@ -2,10 +2,8 @@ services:
   api:
     build:
       context: .
-      args:
-        APP_VARIANT: fastapi
+      target: fastapi
     image: faceverification:fastapi
-    command: uvicorn faceverification.interfaces.fastapi_app:app --host 0.0.0.0 --port 8000
     ports:
       - "8000:8000"
     environment:
@@ -23,10 +21,8 @@ services:
   gradio:
     build:
       context: .
-      args:
-        APP_VARIANT: gradio
+      target: gradio
     image: faceverification:gradio
-    command: python -m faceverification.interfaces.gradio_app
     profiles:
       - gradio
     ports:

infra/bicep/main.bicep

@@ -129,10 +129,6 @@ resource app 'Microsoft.App/containerApps@2024-03-01' = {
           name: 'api'
           image: image
           env: [
-            {
-              name: 'APP_VARIANT'
-              value: 'fastapi'
-            }
             {
               name: 'FACEVERIFICATION_DEVICE'
               value: 'cpu'