Standardize on GOTENBERG_API_URL; fix devcontainer build

- Remove Yarn repo before apt-get in devcontainer (expired GPG key)
- Consolidate to GOTENBERG_API_URL only (remove GOTENBERG_URL usage)
- Use service name in docker-compose (gotenberg:3000)
- Generalize utils.get_env() for any variable
- Add Swarm deployment note for gotenberg.web hostname

Author: christoph2806

.devcontainer/Dockerfile

@@ -1,5 +1,8 @@
 FROM mcr.microsoft.com/devcontainers/python:1-3.12-bullseye
 
+# Remove Yarn repo (expired GPG key breaks apt-get update in base image)
+RUN rm -f /etc/apt/sources.list.d/yarn.list 2>/dev/null || true
+
 # Install system dependencies for document processing
 RUN apt-get update && apt-get install -y \
     libreoffice \

Dockerfile

@@ -4,6 +4,7 @@ WORKDIR /code
 
 # RUN python -m venv venv
 # ENV PATH="venv/bin:$PATH"
+# Default for standalone runs; override in deployment (e.g. GOTENBERG_API_URL=http://gotenberg.web:3000 for Swarm)
 ENV GOTENBERG_API_URL=http://host.docker.internal:3000
 
 COPY ./requirements.txt /code/requirements.txt

TESTING.md

@@ -290,7 +290,7 @@ For CI/CD integration:
   run: |
     ./run_tests.sh --skip-services
   env:
-    GOTENBERG_URL: http://gotenberg:3000
+    GOTENBERG_API_URL: http://gotenberg:3000
     DOCUMENT_SERVICE_URL: http://localhost:8000
 ```
 

docker-compose.yaml

@@ -16,5 +16,5 @@ services:
     ports:
       - "8000:8000"
     environment:
-      - GOTENBERG_API_URL=http://gotenberg-service:3000
+      - GOTENBERG_API_URL=http://gotenberg:3000
       - UNDEFINED_BEHAVIOR=debug

docs/installation.md

@@ -135,6 +135,8 @@ This optimized image reduces cold start times and resource usage.
 |----------|-------------|---------|----------|
 | `GOTENBERG_API_URL` | URL to Gotenberg service | `http://host.docker.internal:3000` | Yes |
 
+**Note:** Only `GOTENBERG_API_URL` is used. For Docker Swarm, use the service DNS name, e.g. `http://gotenberg.web:3000` when the Gotenberg service is in the `web` stack.
+
 ## Verification
 
 After installation, verify everything is working:

tests/test_error_handling.py

@@ -24,7 +24,7 @@
 
 # Test configuration
 BASE_URL = "http://localhost:8000"
-GOTENBERG_URL = "http://localhost:3000"
+GOTENBERG_API_URL = "http://localhost:3000"
 TEST_FILES_DIR = Path("test_files")
 
 # Ensure test files directory exists
@@ -47,7 +47,7 @@ def wait_for_services(timeout: int = 60):
         """Wait for both services to be ready"""
         services = [
             (BASE_URL, "Document service"),
-            (GOTENBERG_URL, "Gotenberg service")
+            (GOTENBERG_API_URL, "Gotenberg service")
         ]
 
         for url, name in services:
@@ -202,7 +202,7 @@ def create_docx_from_html(html_content: str, output_path: Path):
                     }
 
                     response = requests.post(
-                        f"{GOTENBERG_URL}/forms/libreoffice/convert",
+                        f"{GOTENBERG_API_URL}/forms/libreoffice/convert",
                         files=files,
                         timeout=30
                     )

utils.py

@@ -4,9 +4,7 @@
 env = dotenv_values('./.env')
 
 def get_env(var_name: str) -> str:
-    if 'GOTENBERG_API_URL' in os.environ:
-        return os.environ['GOTENBERG_API_URL']
-    return env[var_name]
+    return os.environ.get(var_name) or env.get(var_name, "")
 
 def remove_file(filename: str):
     file_path = 'temp/{}'.format(filename)