Merge branch 'main' into dependabot/npm_and_yarn/samples/pulumi-remix-postgres/remix/tar-fs-2.1.4

Author: raphaeltm

.github/workflows/check-sample.yml

@@ -30,6 +30,8 @@ jobs:
           ./scripts/check-modified-samples.sh > modified.txt
           echo "@@ MODIFIED @@"
           cat modified.txt
+          echo "@@ CHECKLIST @@"
+          cat checklist.txt
 
       # TODO: Uncomment the following lines to validate the Compose files
       #       once we figure out how to prevent it from erroring on warnings.

.github/workflows/deploy-changed-samples.yml

@@ -102,6 +102,7 @@ jobs:
           TEST_SLACK_CHANNEL_ID: ${{ secrets.TEST_SLACK_CHANNEL_ID }}
           TEST_SLACK_TOKEN: ${{ secrets.TEST_SLACK_TOKEN }}
           TEST_SHARED_SECRETS: ${{ secrets.TEST_SHARED_SECRETS}}
+          TEST_SSL_MODE: ${{ secrets.TEST_SSL_MODE }}
           TEST_TAVILY_API_KEY: ${{ secrets.TEST_TAVILY_API_KEY }}
           TEST_ALLOWED_HOSTS: ${{ secrets.TEST_ALLOWED_HOSTS }}
         run: |

README.md

@@ -10,4 +10,4 @@ To start working on a new sample, run `. ./scripts/new-sample` from the root of
 
 ### Testing Samples
 
-When you add a new sample, make sure to add any config vals to the `deploy-changed-samples.yml` workflow. They need to be prefixed with `TEST_` and those values need to be set in the repo secrets.
+When you add a new sample, make sure to add any config vals to the `deploy-changed-samples.yml` workflow. They need to be prefixed with `TEST_` and those values need to be set in the repo secrets. **NOTE** at the moment test break if we have a config value that only shows up in string interpolation in a longer string, for example in `ENV_NAME: proto://user:${PASSWORD}@host` if `PASSWORD` only ever shows up in that longer string, it will break the test. A workaround is to just add a line with `PASSWORD:` in the environment section, so the test can pick it up. Ugly, but works for now.

samples/agentic-strands/app/Dockerfile

@@ -158,6 +158,12 @@ def chat():
         print(f"Error in /chat endpoint: {str(e)}")
         return jsonify({"error": str(e), "response": str(e)}), 500
 
+@app.get("/health")
+def health_check():
+    """Health check endpoint"""
+    return "ok"
+
+
 # Start Flask server when this script is run directly
 if __name__ == '__main__':
 

samples/agentic-strands/app/agent.py samples/agentic-strands/app/main.pysamples/agentic-strands/app/agent.py renamed to samples/agentic-strands/app/main.py

@@ -4,7 +4,6 @@ services:
     # domainname: example.com
     build:
       context: ./app
-      dockerfile: Dockerfile
     ports:
       - target: 5001
         published: 5001
@@ -13,13 +12,25 @@ services:
       LLM_URL: http://llm/api/v1/
       LLM_MODEL: default
       OPENAI_API_KEY: FAKE_TOKEN
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "python3",
+          "-c",
+          "import urllib.request; exit(0) if urllib.request.urlopen('http://localhost:5001/health').status == 200 else exit(1)",
+        ]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
     depends_on:
       - llm
 
   llm:
     environment:
       - OPENAI_API_KEY=FAKE_TOKEN
-    image: defangio/openai-access-gateway:06339c7
+    image: defangio/openai-access-gateway
     ports:
       - target: 80
         published: 80

samples/agentic-strands/compose.yaml

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Apply database migrations
-python manage.py migrate
-
 # Create superuser if not exists
 python manage.py createsuperauto
 

samples/django-celery/app/command.sh

@@ -10,6 +10,7 @@ services:
       - POSTGRES_URL=postgres://postgres:${POSTGRES_PASSWORD}@database:5432/postgres
     depends_on:
       - database
+      - migrate
       - broker
     ports:
       - mode: ingress
@@ -22,6 +23,19 @@ services:
       retries: 3
       start_period: 20s
 
+  migrate:
+    restart: no
+    build:
+      context: ./app
+      dockerfile: Dockerfile
+    environment:
+      - SECRET_KEY
+      - REDIS_URL=redis://broker:6379/0
+      - POSTGRES_URL=postgres://postgres:${POSTGRES_PASSWORD}@database:5432/postgres
+    depends_on:
+      - database
+    command: python manage.py migrate
+
   worker:
     restart: unless-stopped
     build:
@@ -37,6 +51,7 @@ services:
     depends_on:
       - database
       - broker
+      - migrate
     command: celery -A django_celery worker --loglevel=info
 
   database:

samples/django-celery/compose.yaml

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(docker compose:*)"
+    ],
+    "deny": []
+  }
+}

samples/django-channels-redis-postgres/.claude/settings.local.json

@@ -1,5 +1,5 @@
 # Use a smaller base image
-FROM python:3.10-slim-buster
+FROM python:3.10-slim-bullseye
 
 # Set environment variables
 ENV PYTHONDONTWRITEBYTECODE=1
@@ -12,7 +12,8 @@ RUN apt-get update \
     && apt-get install -y \
         gcc \
         python3-dev \
-        libpq-dev
+        libpq-dev \
+        netcat-openbsd
 
 # Install dependencies
 COPY requirements.txt /app/
@@ -32,4 +33,4 @@ RUN adduser --disabled-password --gecos '' django
 USER django
 
 # Start server
-CMD ["sh", "-c", "python manage.py migrate && daphne -b 0.0.0.0 -p 8000 django_defang.asgi:application"]
+CMD ["sh", "-c", "daphne -b 0.0.0.0 -p 8000 django_defang.asgi:application"]