From 1b5825b1e25efd5c5bf50279661ad9058b9e8e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lio=E6=9D=8E=E6=AD=90?= Date: Wed, 24 Jun 2026 09:37:58 -0700 Subject: [PATCH] Revert "remove compose file names, update docker model runner syntax" --- samples/agentic-autogen/compose.yaml | 1 + samples/agentic-langgraph/compose.yaml | 1 + samples/agentic-strands/compose.yaml | 1 + samples/angular-express/compose.yaml | 1 + samples/arduino-wifi/compose.yaml | 1 + samples/bullmq-bullboard-redis/compose.yaml | 1 + samples/crewai/compose.yaml | 1 + samples/csharp-dotnet/compose.yaml | 1 + samples/defang-provider-handoff/compose.yaml | 1 + samples/django-celery/compose.yaml | 1 + samples/django-postgres/compose.yaml | 1 + samples/django-railpack/compose.yaml | 1 + samples/django-redis-postgres/compose.yaml | 1 + samples/django/compose.yaml | 1 + samples/elysia/compose.yaml | 1 + samples/fastapi-postgres-pubsub/compose.yaml | 1 + samples/fastapi-postgres/compose.yaml | 1 + samples/fastapi/compose.yaml | 1 + samples/feathersjs/compose.yaml | 1 + samples/flask-railpack/compose.yaml | 1 + samples/flask/compose.yaml | 1 + samples/golang-http-form/compose.yaml | 1 + samples/golang-http/compose.yaml | 1 + samples/golang-mongodb/compose.yaml | 1 + samples/golang-openai/compose.yaml | 1 + samples/golang-railpack/compose.yaml | 1 + samples/golang-rest-api/compose.yaml | 1 + samples/golang-s3/compose.yaml | 1 + samples/golang-slackbot/compose.yaml | 1 + samples/google-adk/compose.yaml | 1 + samples/hasura/compose.yaml | 1 + samples/html-css-js/compose.yaml | 1 + samples/huginn/compose.yaml | 1 + samples/imgproxy/compose.yaml | 1 + samples/javalin/compose.yaml | 1 + samples/jupyter-postgres/compose.yaml | 1 + samples/langchain/compose.yaml | 1 + samples/managed-llm-provider/compose.yaml | 1 + samples/managed-llm/compose.yaml | 1 + samples/mastra-extended/compose.dev.yaml | 35 ++++++++------- samples/mastra-extended/compose.yaml | 47 +++++++++++++------- samples/mastra-nextjs/compose.yaml | 1 + samples/mcp/compose.yaml | 1 + samples/metabase/compose.yaml | 1 + samples/n8n/compose.yaml | 1 + samples/nextjs-blog/compose.yaml | 1 + samples/nextjs-claude/compose.yaml | 1 + samples/nextjs-cv/compose.yaml | 1 + samples/nextjs-documentation/compose.yaml | 1 + samples/nextjs-postgres/compose.yaml | 1 + samples/nextjs-railpack/compose.yaml | 1 + samples/nextjs/compose.yaml | 1 + samples/nocodb/compose.yaml | 1 + samples/nodejs-chatroom/compose.yaml | 1 + samples/nodejs-express/compose.yaml | 1 + samples/nodejs-form/compose.yaml | 1 + samples/nodejs-http/compose.yaml | 1 + samples/nodejs-openai/compose.yaml | 1 + samples/nodejs-react-postgres/compose.yaml | 1 + samples/nodejs-rest-api/compose.yaml | 1 + samples/nodejs-s3/compose.yaml | 1 + samples/nounly/compose.yaml | 1 + samples/ollama/compose.yaml | 1 + samples/phoenix-postgres/compose.yaml | 1 + samples/platformatic/compose.yaml | 1 + samples/python-form/compose.yaml | 1 + samples/python-implicit-gpu/compose.yaml | 1 + samples/python-minimal/compose.yaml | 1 + samples/python-openai/compose.yaml | 1 + samples/python-rest-api/compose.yaml | 1 + samples/python-s3/compose.yaml | 1 + samples/rails/compose.yaml | 1 + samples/react-vite-railpack/compose.yaml | 1 + samples/react/compose.yaml | 1 + samples/redis-js/compose.yaml | 1 + samples/rocket/compose.yaml | 1 + samples/sailsjs-postgres/compose.yaml | 1 + samples/sailsjs/compose.yaml | 1 + samples/svelte-mysql/compose.yaml | 1 + samples/sveltekit-mongodb/compose.yaml | 1 + samples/sveltekit/compose.yaml | 1 + samples/vllm/compose.yaml | 1 + samples/vuejs/compose.yaml | 1 + scripts/check-sample-files.sh | 7 +++ 84 files changed, 139 insertions(+), 31 deletions(-) diff --git a/samples/agentic-autogen/compose.yaml b/samples/agentic-autogen/compose.yaml index e887d3835..4dc40a242 100644 --- a/samples/agentic-autogen/compose.yaml +++ b/samples/agentic-autogen/compose.yaml @@ -1,3 +1,4 @@ +name: agentic-autogen services: autogen: build: diff --git a/samples/agentic-langgraph/compose.yaml b/samples/agentic-langgraph/compose.yaml index c432800ca..c4dd39e2e 100644 --- a/samples/agentic-langgraph/compose.yaml +++ b/samples/agentic-langgraph/compose.yaml @@ -1,3 +1,4 @@ +name: agentic-langgraph services: app: build: diff --git a/samples/agentic-strands/compose.yaml b/samples/agentic-strands/compose.yaml index dc2dc9e0f..3b1eb67b5 100644 --- a/samples/agentic-strands/compose.yaml +++ b/samples/agentic-strands/compose.yaml @@ -1,3 +1,4 @@ +name: agentic-strands services: app: build: diff --git a/samples/angular-express/compose.yaml b/samples/angular-express/compose.yaml index bf0be43d9..17df9a288 100644 --- a/samples/angular-express/compose.yaml +++ b/samples/angular-express/compose.yaml @@ -1,3 +1,4 @@ +name: angular-express services: angular-frontend: build: diff --git a/samples/arduino-wifi/compose.yaml b/samples/arduino-wifi/compose.yaml index b089aef97..b43119149 100644 --- a/samples/arduino-wifi/compose.yaml +++ b/samples/arduino-wifi/compose.yaml @@ -1,3 +1,4 @@ +name: arduino-wifi services: flask: restart: unless-stopped diff --git a/samples/bullmq-bullboard-redis/compose.yaml b/samples/bullmq-bullboard-redis/compose.yaml index cd1e7f02f..ee5f6ccf2 100644 --- a/samples/bullmq-bullboard-redis/compose.yaml +++ b/samples/bullmq-bullboard-redis/compose.yaml @@ -1,3 +1,4 @@ +name: bullmq-bullboard-redis services: board: restart: unless-stopped diff --git a/samples/crewai/compose.yaml b/samples/crewai/compose.yaml index 0102e2a6f..2c232310a 100644 --- a/samples/crewai/compose.yaml +++ b/samples/crewai/compose.yaml @@ -1,3 +1,4 @@ +name: crewai services: postgres: image: pgvector/pgvector:pg16 diff --git a/samples/csharp-dotnet/compose.yaml b/samples/csharp-dotnet/compose.yaml index bc53661ec..4a4953965 100644 --- a/samples/csharp-dotnet/compose.yaml +++ b/samples/csharp-dotnet/compose.yaml @@ -1,3 +1,4 @@ +name: csharp-dotnet services: web: image: csharp-dotnet diff --git a/samples/defang-provider-handoff/compose.yaml b/samples/defang-provider-handoff/compose.yaml index a3b3bc6a1..24738267c 100644 --- a/samples/defang-provider-handoff/compose.yaml +++ b/samples/defang-provider-handoff/compose.yaml @@ -1,3 +1,4 @@ +name: defang-provider-handoff services: app: restart: unless-stopped diff --git a/samples/django-celery/compose.yaml b/samples/django-celery/compose.yaml index 19c1d7f7e..0d1450652 100644 --- a/samples/django-celery/compose.yaml +++ b/samples/django-celery/compose.yaml @@ -1,3 +1,4 @@ +name: django-celery services: web: restart: unless-stopped diff --git a/samples/django-postgres/compose.yaml b/samples/django-postgres/compose.yaml index 6d8e9934b..92dcde900 100644 --- a/samples/django-postgres/compose.yaml +++ b/samples/django-postgres/compose.yaml @@ -1,3 +1,4 @@ +name: django-postgres services: db: restart: unless-stopped diff --git a/samples/django-railpack/compose.yaml b/samples/django-railpack/compose.yaml index bd0ba1db4..50cc5d80a 100644 --- a/samples/django-railpack/compose.yaml +++ b/samples/django-railpack/compose.yaml @@ -1,3 +1,4 @@ +name: django-railpack services: django: restart: unless-stopped diff --git a/samples/django-redis-postgres/compose.yaml b/samples/django-redis-postgres/compose.yaml index b5805a498..ab05a6c5f 100644 --- a/samples/django-redis-postgres/compose.yaml +++ b/samples/django-redis-postgres/compose.yaml @@ -1,3 +1,4 @@ +name: django-redis-postgres services: app: build: diff --git a/samples/django/compose.yaml b/samples/django/compose.yaml index 3ee1d1b22..9b4bb227f 100644 --- a/samples/django/compose.yaml +++ b/samples/django/compose.yaml @@ -1,3 +1,4 @@ +name: django services: django: restart: unless-stopped diff --git a/samples/elysia/compose.yaml b/samples/elysia/compose.yaml index 71cc868fb..cff51c3be 100644 --- a/samples/elysia/compose.yaml +++ b/samples/elysia/compose.yaml @@ -1,3 +1,4 @@ +name: elysia services: elysia: restart: unless-stopped diff --git a/samples/fastapi-postgres-pubsub/compose.yaml b/samples/fastapi-postgres-pubsub/compose.yaml index 980dea2cc..4b4a88548 100644 --- a/samples/fastapi-postgres-pubsub/compose.yaml +++ b/samples/fastapi-postgres-pubsub/compose.yaml @@ -1,3 +1,4 @@ +name: fastapi-postgres-pubsub services: app_a: build: diff --git a/samples/fastapi-postgres/compose.yaml b/samples/fastapi-postgres/compose.yaml index b592301c7..7f09364ca 100644 --- a/samples/fastapi-postgres/compose.yaml +++ b/samples/fastapi-postgres/compose.yaml @@ -1,3 +1,4 @@ +name: fastapi-postgres services: fastapi: restart: unless-stopped diff --git a/samples/fastapi/compose.yaml b/samples/fastapi/compose.yaml index a1d10c00b..a7868307f 100644 --- a/samples/fastapi/compose.yaml +++ b/samples/fastapi/compose.yaml @@ -1,3 +1,4 @@ +name: fastapi services: fastapi: restart: always diff --git a/samples/feathersjs/compose.yaml b/samples/feathersjs/compose.yaml index 8f8877ff8..1befd2361 100644 --- a/samples/feathersjs/compose.yaml +++ b/samples/feathersjs/compose.yaml @@ -1,3 +1,4 @@ +name: feathersjs services: app: build: diff --git a/samples/flask-railpack/compose.yaml b/samples/flask-railpack/compose.yaml index 2cc171102..afdbdc8d1 100644 --- a/samples/flask-railpack/compose.yaml +++ b/samples/flask-railpack/compose.yaml @@ -1,3 +1,4 @@ +name: flask-railpack services: flask: restart: unless-stopped diff --git a/samples/flask/compose.yaml b/samples/flask/compose.yaml index 268ee0abc..08f74f86e 100644 --- a/samples/flask/compose.yaml +++ b/samples/flask/compose.yaml @@ -1,3 +1,4 @@ +name: flask services: flask: restart: unless-stopped diff --git a/samples/golang-http-form/compose.yaml b/samples/golang-http-form/compose.yaml index 17d32ccba..a7fabd14c 100644 --- a/samples/golang-http-form/compose.yaml +++ b/samples/golang-http-form/compose.yaml @@ -1,3 +1,4 @@ +name: golang-http-form services: app: restart: unless-stopped diff --git a/samples/golang-http/compose.yaml b/samples/golang-http/compose.yaml index 17d32ccba..1d6702bbf 100644 --- a/samples/golang-http/compose.yaml +++ b/samples/golang-http/compose.yaml @@ -1,3 +1,4 @@ +name: golang-http services: app: restart: unless-stopped diff --git a/samples/golang-mongodb/compose.yaml b/samples/golang-mongodb/compose.yaml index e59e7d30c..46f4a47d1 100644 --- a/samples/golang-mongodb/compose.yaml +++ b/samples/golang-mongodb/compose.yaml @@ -1,3 +1,4 @@ +name: golang-mongodb services: app: restart: unless-stopped diff --git a/samples/golang-openai/compose.yaml b/samples/golang-openai/compose.yaml index 18a6f24f5..62351f19e 100644 --- a/samples/golang-openai/compose.yaml +++ b/samples/golang-openai/compose.yaml @@ -1,3 +1,4 @@ +name: golang-openai services: app: restart: unless-stopped diff --git a/samples/golang-railpack/compose.yaml b/samples/golang-railpack/compose.yaml index 04a0a0907..88eea7742 100644 --- a/samples/golang-railpack/compose.yaml +++ b/samples/golang-railpack/compose.yaml @@ -1,3 +1,4 @@ +name: golang-railpack services: app: restart: unless-stopped diff --git a/samples/golang-rest-api/compose.yaml b/samples/golang-rest-api/compose.yaml index 17d32ccba..3e5345b84 100644 --- a/samples/golang-rest-api/compose.yaml +++ b/samples/golang-rest-api/compose.yaml @@ -1,3 +1,4 @@ +name: golang-rest-api services: app: restart: unless-stopped diff --git a/samples/golang-s3/compose.yaml b/samples/golang-s3/compose.yaml index 2829a6ebf..8ecd7e714 100644 --- a/samples/golang-s3/compose.yaml +++ b/samples/golang-s3/compose.yaml @@ -1,3 +1,4 @@ +name: golang-s3 services: app: restart: unless-stopped diff --git a/samples/golang-slackbot/compose.yaml b/samples/golang-slackbot/compose.yaml index b4ad241a2..df58ce5e0 100644 --- a/samples/golang-slackbot/compose.yaml +++ b/samples/golang-slackbot/compose.yaml @@ -1,3 +1,4 @@ +name: golang-slackbot services: bot: restart: unless-stopped diff --git a/samples/google-adk/compose.yaml b/samples/google-adk/compose.yaml index 943a59b7d..ba43e0f25 100644 --- a/samples/google-adk/compose.yaml +++ b/samples/google-adk/compose.yaml @@ -1,3 +1,4 @@ +name: google-adk services: agent: build: . diff --git a/samples/hasura/compose.yaml b/samples/hasura/compose.yaml index 266316e91..cce30039c 100644 --- a/samples/hasura/compose.yaml +++ b/samples/hasura/compose.yaml @@ -1,3 +1,4 @@ +name: hasura services: hasura: restart: unless-stopped diff --git a/samples/html-css-js/compose.yaml b/samples/html-css-js/compose.yaml index 21e3f6c77..4fd7999cd 100644 --- a/samples/html-css-js/compose.yaml +++ b/samples/html-css-js/compose.yaml @@ -1,3 +1,4 @@ +name: html-css-js services: app: restart: unless-stopped diff --git a/samples/huginn/compose.yaml b/samples/huginn/compose.yaml index 6964f5f95..1263e08cd 100644 --- a/samples/huginn/compose.yaml +++ b/samples/huginn/compose.yaml @@ -1,3 +1,4 @@ +name: huginn services: huginn: image: ghcr.io/huginn/huginn diff --git a/samples/imgproxy/compose.yaml b/samples/imgproxy/compose.yaml index 5cf7e9c61..dcc9f18f0 100644 --- a/samples/imgproxy/compose.yaml +++ b/samples/imgproxy/compose.yaml @@ -1,3 +1,4 @@ +name: imgproxy services: imgproxy: restart: unless-stopped diff --git a/samples/javalin/compose.yaml b/samples/javalin/compose.yaml index be7a30cfd..5c802c0ca 100644 --- a/samples/javalin/compose.yaml +++ b/samples/javalin/compose.yaml @@ -1,3 +1,4 @@ +name: javalin services: javalin-app: build: diff --git a/samples/jupyter-postgres/compose.yaml b/samples/jupyter-postgres/compose.yaml index 867a142ac..488a2dd27 100644 --- a/samples/jupyter-postgres/compose.yaml +++ b/samples/jupyter-postgres/compose.yaml @@ -1,3 +1,4 @@ +name: jupyter-postgres services: jupyter: build: diff --git a/samples/langchain/compose.yaml b/samples/langchain/compose.yaml index 94493b9c3..80ab3eee9 100644 --- a/samples/langchain/compose.yaml +++ b/samples/langchain/compose.yaml @@ -1,3 +1,4 @@ +name: langchain services: langchain-app: build: diff --git a/samples/managed-llm-provider/compose.yaml b/samples/managed-llm-provider/compose.yaml index 843b74fae..a5ea5e836 100644 --- a/samples/managed-llm-provider/compose.yaml +++ b/samples/managed-llm-provider/compose.yaml @@ -1,3 +1,4 @@ +name: managed-llm-provider services: app: build: diff --git a/samples/managed-llm/compose.yaml b/samples/managed-llm/compose.yaml index abf1873fd..c89e85976 100644 --- a/samples/managed-llm/compose.yaml +++ b/samples/managed-llm/compose.yaml @@ -1,3 +1,4 @@ +name: managed-llm services: app: build: diff --git a/samples/mastra-extended/compose.dev.yaml b/samples/mastra-extended/compose.dev.yaml index 879c2fa3c..c49f331e8 100644 --- a/samples/mastra-extended/compose.dev.yaml +++ b/samples/mastra-extended/compose.dev.yaml @@ -1,3 +1,4 @@ +name: mastra-extended-dev services: app: build: @@ -11,14 +12,12 @@ services: QUEUE_NAME: support-sync LOCAL_FAST_DATA: "true" MOCK_AGENT: "false" - models: + OPENAI_API_KEY: defang + depends_on: chat: - endpoint_var: CHAT_URL - model_var: CHAT_MODEL + condition: service_started embedding: - endpoint_var: EMBEDDING_URL - model_var: EMBEDDING_MODEL - depends_on: + condition: service_started postgres: condition: service_healthy redis: @@ -35,14 +34,12 @@ services: QUEUE_NAME: support-sync LOCAL_FAST_DATA: "true" MOCK_AGENT: "false" - models: + OPENAI_API_KEY: defang + depends_on: chat: - endpoint_var: CHAT_URL - model_var: CHAT_MODEL + condition: service_started embedding: - endpoint_var: EMBEDDING_URL - model_var: EMBEDDING_MODEL - depends_on: + condition: service_started postgres: condition: service_healthy redis: @@ -73,11 +70,19 @@ services: ports: - 6379:6379 -models: chat: - model: ai/gemma3:1B-Q4_K_M + provider: + type: model + options: + model: ai/qwen2.5:3B-Q4_K_M + x-defang-llm: true + embedding: - model: ai/mxbai-embed-large + provider: + type: model + options: + model: ai/mxbai-embed-large + x-defang-llm: true volumes: pgdata: diff --git a/samples/mastra-extended/compose.yaml b/samples/mastra-extended/compose.yaml index d5f248d55..07b160b57 100644 --- a/samples/mastra-extended/compose.yaml +++ b/samples/mastra-extended/compose.yaml @@ -1,3 +1,4 @@ +name: mastra-extended services: app: build: @@ -12,14 +13,11 @@ services: REDIS_URL: redis://redis:6379 QUEUE_NAME: support-sync MOCK_AGENT: "false" - models: + depends_on: chat: - endpoint_var: CHAT_URL - model_var: CHAT_MODEL + condition: service_started embedding: - endpoint_var: EMBEDDING_URL - model_var: EMBEDDING_MODEL - depends_on: + condition: service_started postgres: condition: service_healthy redis: @@ -49,14 +47,11 @@ services: REDIS_URL: redis://redis:6379 QUEUE_NAME: support-sync MOCK_AGENT: "false" - models: + depends_on: chat: - endpoint_var: CHAT_URL - model_var: CHAT_MODEL + condition: service_started embedding: - endpoint_var: EMBEDDING_URL - model_var: EMBEDDING_MODEL - depends_on: + condition: service_started postgres: condition: service_healthy redis: @@ -104,9 +99,29 @@ services: reservations: cpus: "0.25" memory: 256M - -models: chat: - model: ai/chat-default + provider: + type: model + options: + model: chat-default + x-defang-llm: true + environment: + OPENAI_API_KEY: defang + deploy: + resources: + reservations: + cpus: "0.5" + memory: 512M embedding: - model: ai/embedding-default + provider: + type: model + options: + model: embedding-default + x-defang-llm: true + environment: + OPENAI_API_KEY: defang + deploy: + resources: + reservations: + cpus: "0.5" + memory: 512M diff --git a/samples/mastra-nextjs/compose.yaml b/samples/mastra-nextjs/compose.yaml index 52277c902..b63f1d110 100644 --- a/samples/mastra-nextjs/compose.yaml +++ b/samples/mastra-nextjs/compose.yaml @@ -1,3 +1,4 @@ +name: mastra-nextjs services: app: x-defang-llm: true diff --git a/samples/mcp/compose.yaml b/samples/mcp/compose.yaml index 905833004..6e60a5e6c 100644 --- a/samples/mcp/compose.yaml +++ b/samples/mcp/compose.yaml @@ -1,3 +1,4 @@ +name: mcp services: service-1: build: diff --git a/samples/metabase/compose.yaml b/samples/metabase/compose.yaml index 2facbf627..9cab01b60 100644 --- a/samples/metabase/compose.yaml +++ b/samples/metabase/compose.yaml @@ -1,3 +1,4 @@ +name: metabase services: metabase: restart: unless-stopped diff --git a/samples/n8n/compose.yaml b/samples/n8n/compose.yaml index e317233dd..bbfe4ab93 100644 --- a/samples/n8n/compose.yaml +++ b/samples/n8n/compose.yaml @@ -1,3 +1,4 @@ +name: n8n services: postgres: image: postgres:16 diff --git a/samples/nextjs-blog/compose.yaml b/samples/nextjs-blog/compose.yaml index 2465a23d6..017c122d4 100644 --- a/samples/nextjs-blog/compose.yaml +++ b/samples/nextjs-blog/compose.yaml @@ -1,3 +1,4 @@ +name: nextjs-blog services: blogstarter: restart: unless-stopped diff --git a/samples/nextjs-claude/compose.yaml b/samples/nextjs-claude/compose.yaml index 6bb5e650b..af0a95dc9 100644 --- a/samples/nextjs-claude/compose.yaml +++ b/samples/nextjs-claude/compose.yaml @@ -1,3 +1,4 @@ +name: nextjs-claude services: nextjs-claude: build: diff --git a/samples/nextjs-cv/compose.yaml b/samples/nextjs-cv/compose.yaml index f2b89126f..7b5bfdf7c 100644 --- a/samples/nextjs-cv/compose.yaml +++ b/samples/nextjs-cv/compose.yaml @@ -1,3 +1,4 @@ +name: nextjs-cv services: app: build: diff --git a/samples/nextjs-documentation/compose.yaml b/samples/nextjs-documentation/compose.yaml index 8e32637ea..ede196c77 100644 --- a/samples/nextjs-documentation/compose.yaml +++ b/samples/nextjs-documentation/compose.yaml @@ -1,3 +1,4 @@ +name: nextjs-documentation services: documentstarter: restart: unless-stopped diff --git a/samples/nextjs-postgres/compose.yaml b/samples/nextjs-postgres/compose.yaml index 7ad81878f..7a2d87b3c 100644 --- a/samples/nextjs-postgres/compose.yaml +++ b/samples/nextjs-postgres/compose.yaml @@ -1,3 +1,4 @@ +name: nextjs-postgres services: app: build: diff --git a/samples/nextjs-railpack/compose.yaml b/samples/nextjs-railpack/compose.yaml index 1e41a3e2f..73026fa96 100644 --- a/samples/nextjs-railpack/compose.yaml +++ b/samples/nextjs-railpack/compose.yaml @@ -1,3 +1,4 @@ +name: nextjs-railpack services: app: restart: unless-stopped diff --git a/samples/nextjs/compose.yaml b/samples/nextjs/compose.yaml index 335386bb8..5c281403e 100644 --- a/samples/nextjs/compose.yaml +++ b/samples/nextjs/compose.yaml @@ -1,3 +1,4 @@ +name: nextjs services: app: restart: unless-stopped diff --git a/samples/nocodb/compose.yaml b/samples/nocodb/compose.yaml index faaf12ffb..dfc44e8de 100644 --- a/samples/nocodb/compose.yaml +++ b/samples/nocodb/compose.yaml @@ -1,3 +1,4 @@ +name: nocodb services: nocodb: image: nocodb/nocodb:0.252.0 diff --git a/samples/nodejs-chatroom/compose.yaml b/samples/nodejs-chatroom/compose.yaml index dfeb38b72..46167c8dd 100644 --- a/samples/nodejs-chatroom/compose.yaml +++ b/samples/nodejs-chatroom/compose.yaml @@ -1,3 +1,4 @@ +name: nodejs-chatroom services: chat: restart: unless-stopped diff --git a/samples/nodejs-express/compose.yaml b/samples/nodejs-express/compose.yaml index 3b0d36d8a..d641862ce 100644 --- a/samples/nodejs-express/compose.yaml +++ b/samples/nodejs-express/compose.yaml @@ -1,3 +1,4 @@ +name: nodejs-express services: app: restart: unless-stopped diff --git a/samples/nodejs-form/compose.yaml b/samples/nodejs-form/compose.yaml index cd348c8cb..e42bc4b8c 100644 --- a/samples/nodejs-form/compose.yaml +++ b/samples/nodejs-form/compose.yaml @@ -1,3 +1,4 @@ +name: nodejs-form services: app: restart: unless-stopped diff --git a/samples/nodejs-http/compose.yaml b/samples/nodejs-http/compose.yaml index cd348c8cb..c47ac4e75 100644 --- a/samples/nodejs-http/compose.yaml +++ b/samples/nodejs-http/compose.yaml @@ -1,3 +1,4 @@ +name: nodejs-http services: app: restart: unless-stopped diff --git a/samples/nodejs-openai/compose.yaml b/samples/nodejs-openai/compose.yaml index 1541bf296..922711170 100644 --- a/samples/nodejs-openai/compose.yaml +++ b/samples/nodejs-openai/compose.yaml @@ -1,3 +1,4 @@ +name: nodejs-openai services: app: restart: unless-stopped diff --git a/samples/nodejs-react-postgres/compose.yaml b/samples/nodejs-react-postgres/compose.yaml index f9d791fa5..a3865e4fd 100644 --- a/samples/nodejs-react-postgres/compose.yaml +++ b/samples/nodejs-react-postgres/compose.yaml @@ -1,3 +1,4 @@ +name: nodejs-react-postgres services: todo_list: restart: unless-stopped diff --git a/samples/nodejs-rest-api/compose.yaml b/samples/nodejs-rest-api/compose.yaml index cd348c8cb..6690a56b3 100644 --- a/samples/nodejs-rest-api/compose.yaml +++ b/samples/nodejs-rest-api/compose.yaml @@ -1,3 +1,4 @@ +name: nodejs-rest-api services: app: restart: unless-stopped diff --git a/samples/nodejs-s3/compose.yaml b/samples/nodejs-s3/compose.yaml index e10ecdd5a..8d6e2c67f 100644 --- a/samples/nodejs-s3/compose.yaml +++ b/samples/nodejs-s3/compose.yaml @@ -1,3 +1,4 @@ +name: nodejs-s3 services: app: restart: unless-stopped diff --git a/samples/nounly/compose.yaml b/samples/nounly/compose.yaml index f59b93839..64e267e02 100644 --- a/samples/nounly/compose.yaml +++ b/samples/nounly/compose.yaml @@ -1,3 +1,4 @@ +name: nounly services: nounly: restart: always diff --git a/samples/ollama/compose.yaml b/samples/ollama/compose.yaml index 3b9f29f46..74bcde931 100644 --- a/samples/ollama/compose.yaml +++ b/samples/ollama/compose.yaml @@ -1,3 +1,4 @@ +name: ollama services: ollama: build: diff --git a/samples/phoenix-postgres/compose.yaml b/samples/phoenix-postgres/compose.yaml index 5dff790ae..f32ebdec5 100644 --- a/samples/phoenix-postgres/compose.yaml +++ b/samples/phoenix-postgres/compose.yaml @@ -1,3 +1,4 @@ +name: phoenix-postgres services: phoenix: restart: unless-stopped diff --git a/samples/platformatic/compose.yaml b/samples/platformatic/compose.yaml index 0b6ff16b2..0367cdefc 100644 --- a/samples/platformatic/compose.yaml +++ b/samples/platformatic/compose.yaml @@ -1,3 +1,4 @@ +name: platformatic services: app: build: diff --git a/samples/python-form/compose.yaml b/samples/python-form/compose.yaml index e5ae67d12..111e8948a 100644 --- a/samples/python-form/compose.yaml +++ b/samples/python-form/compose.yaml @@ -1,3 +1,4 @@ +name: python-form services: app: restart: unless-stopped diff --git a/samples/python-implicit-gpu/compose.yaml b/samples/python-implicit-gpu/compose.yaml index c53045c15..397592aaa 100644 --- a/samples/python-implicit-gpu/compose.yaml +++ b/samples/python-implicit-gpu/compose.yaml @@ -1,3 +1,4 @@ +name: python-implicit-gpu services: app: restart: unless-stopped diff --git a/samples/python-minimal/compose.yaml b/samples/python-minimal/compose.yaml index e5ae67d12..d6f4c9b70 100644 --- a/samples/python-minimal/compose.yaml +++ b/samples/python-minimal/compose.yaml @@ -1,3 +1,4 @@ +name: python-minimal services: app: restart: unless-stopped diff --git a/samples/python-openai/compose.yaml b/samples/python-openai/compose.yaml index 83ed47a66..9d131ec26 100644 --- a/samples/python-openai/compose.yaml +++ b/samples/python-openai/compose.yaml @@ -1,3 +1,4 @@ +name: python-openai services: app: restart: unless-stopped diff --git a/samples/python-rest-api/compose.yaml b/samples/python-rest-api/compose.yaml index e5ae67d12..765ce6ab1 100644 --- a/samples/python-rest-api/compose.yaml +++ b/samples/python-rest-api/compose.yaml @@ -1,3 +1,4 @@ +name: python-rest-api services: app: restart: unless-stopped diff --git a/samples/python-s3/compose.yaml b/samples/python-s3/compose.yaml index 665629674..455ec785d 100644 --- a/samples/python-s3/compose.yaml +++ b/samples/python-s3/compose.yaml @@ -1,3 +1,4 @@ +name: python-s3 services: app: restart: unless-stopped diff --git a/samples/rails/compose.yaml b/samples/rails/compose.yaml index a480e1b6d..d96fea67d 100644 --- a/samples/rails/compose.yaml +++ b/samples/rails/compose.yaml @@ -1,3 +1,4 @@ +name: rails services: rails: restart: unless-stopped diff --git a/samples/react-vite-railpack/compose.yaml b/samples/react-vite-railpack/compose.yaml index f1f57b626..72d406d6d 100644 --- a/samples/react-vite-railpack/compose.yaml +++ b/samples/react-vite-railpack/compose.yaml @@ -1,3 +1,4 @@ +name: react-vite-railpack services: app: restart: unless-stopped diff --git a/samples/react/compose.yaml b/samples/react/compose.yaml index 1e65d39c0..9ab769240 100644 --- a/samples/react/compose.yaml +++ b/samples/react/compose.yaml @@ -1,3 +1,4 @@ +name: react services: app: restart: unless-stopped diff --git a/samples/redis-js/compose.yaml b/samples/redis-js/compose.yaml index 66eaeee01..df229d5d3 100644 --- a/samples/redis-js/compose.yaml +++ b/samples/redis-js/compose.yaml @@ -1,3 +1,4 @@ +name: redis-js services: app: build: ./app diff --git a/samples/rocket/compose.yaml b/samples/rocket/compose.yaml index c6973ff95..83b1d50a3 100644 --- a/samples/rocket/compose.yaml +++ b/samples/rocket/compose.yaml @@ -1,3 +1,4 @@ +name: rocket services: app: build: diff --git a/samples/sailsjs-postgres/compose.yaml b/samples/sailsjs-postgres/compose.yaml index bdae1d9c8..8b53588c6 100644 --- a/samples/sailsjs-postgres/compose.yaml +++ b/samples/sailsjs-postgres/compose.yaml @@ -1,3 +1,4 @@ +name: sailsjs-postgres services: app: restart: unless-stopped diff --git a/samples/sailsjs/compose.yaml b/samples/sailsjs/compose.yaml index d4c5926f4..2f35fc526 100644 --- a/samples/sailsjs/compose.yaml +++ b/samples/sailsjs/compose.yaml @@ -1,3 +1,4 @@ +name: sailsjs services: sails: restart: unless-stopped diff --git a/samples/svelte-mysql/compose.yaml b/samples/svelte-mysql/compose.yaml index b7c0255b2..bcc2aa2a4 100644 --- a/samples/svelte-mysql/compose.yaml +++ b/samples/svelte-mysql/compose.yaml @@ -1,3 +1,4 @@ +name: svelte-mysql services: db: restart: unless-stopped diff --git a/samples/sveltekit-mongodb/compose.yaml b/samples/sveltekit-mongodb/compose.yaml index 3c4ab1a72..76e406b98 100644 --- a/samples/sveltekit-mongodb/compose.yaml +++ b/samples/sveltekit-mongodb/compose.yaml @@ -1,3 +1,4 @@ +name: sveltekit-mongodb services: sveltekit: restart: unless-stopped diff --git a/samples/sveltekit/compose.yaml b/samples/sveltekit/compose.yaml index 672ef2525..93cc1baf5 100644 --- a/samples/sveltekit/compose.yaml +++ b/samples/sveltekit/compose.yaml @@ -1,3 +1,4 @@ +name: sveltekit services: sveltekit: restart: unless-stopped diff --git a/samples/vllm/compose.yaml b/samples/vllm/compose.yaml index 0c2f68136..659c61eaf 100644 --- a/samples/vllm/compose.yaml +++ b/samples/vllm/compose.yaml @@ -1,3 +1,4 @@ +name: vllm services: mistral: restart: unless-stopped diff --git a/samples/vuejs/compose.yaml b/samples/vuejs/compose.yaml index 1e65d39c0..ff98764d7 100644 --- a/samples/vuejs/compose.yaml +++ b/samples/vuejs/compose.yaml @@ -1,3 +1,4 @@ +name: vuejs services: app: restart: unless-stopped diff --git a/scripts/check-sample-files.sh b/scripts/check-sample-files.sh index f77dff755..8fda82d59 100755 --- a/scripts/check-sample-files.sh +++ b/scripts/check-sample-files.sh @@ -23,6 +23,13 @@ for dir in ./samples/*/; do echo " - [ ] ${dir}compose.yaml is not valid according to \`defang compose config\`: $output" fi ) + + # Ensure the name: in Compose matches the sample/folder name + sample_name=$(basename "$dir") + compose_name=$(grep -E '^name:' "${dir}compose.yaml" | awk '{print $2}') + if [[ "$sample_name" != "$compose_name" ]]; then + echo " - [ ] fix name: in ${dir}compose.yaml to be '$sample_name' (currently '$compose_name')" + fi fi # Check that we NOT have a .github/workflows/defang.yaml file; it's generated from templates/defang.yaml