Merge remote-tracking branch 'origin/main' into 82-javalin-sample

Author: raphaeltm

.github/workflows/check-sample.yml

@@ -26,10 +26,12 @@ jobs:
           echo "@@ MODIFIED @@"
           cat modified.txt
 
-      - name: Validate Compose Files with Defang CLI
-        run: |
-          . <(curl -Ls https://s.defang.io/install)
-          cat modified.txt | xargs -n1 defang compose config -C > /dev/null
+      # TODO: Uncomment the following lines to validate the Compose files
+      #       once we figure out how to prevent it from erroring on warnings.
+      # - name: Validate Compose Files with Defang CLI
+      #   run: |
+      #     . <(curl -Ls https://s.defang.io/install)
+      #     cat modified.txt | xargs -n1 defang compose config -C > /dev/null
 
       - name: Add checklist to PR description
         uses: actions/github-script@v5

samples/angular-express/README.md

@@ -37,6 +37,6 @@ Title: Angular & Node.js
 
 Short Description: A full-stack application using Angular for the frontend and Node.js with Socket.IO for the backend, containerized with Docker.
 
-Tags: angular, nodejs, Socket.IO
+Tags: Angular, Node.js, Socket.IO, TypeScript, JavaScript
 
-Languages: typescript, javascript
+Languages: nodejs

samples/bullmq-bullboard-redis/README.md

@@ -8,7 +8,6 @@ To add a job to the queue, you can go to the `/add` route of the `api` service.
 
 The `worker` service is the queue processor that will process the jobs added to the queue. You can see in the `compose.yaml` file that the `worker` service is set to scale to 2 instances. This means that there will be 2 workers processing jobs from the queue. You can set this to your desired number of workers, but we wanted to show how you can increase the number of workers to handle more jobs.
 
-
 ## Prerequisites
 
 1. Download <a href="https://github.com/defang-io/defang">Defang CLI</a>
@@ -21,7 +20,6 @@ The `worker` service is the queue processor that will process the jobs added to
 3. Type `defang compose up` in the CLI.
 4. Your app will be running within a few minutes.
 
-
 ## Local Development
 
 1. Run `docker compose -f compose.dev.yaml up`
@@ -32,6 +30,6 @@ Title: BullMQ & BullBoard & Redis
 
 Short Description: A sample project with BullMQ, BullBoard, and Redis.
 
-Tags: BullMQ, BullBoard, Redis, Express, Node.js, Message Queue
+Tags: BullMQ, BullBoard, Redis, Express, Node.js, Message Queue, JavaScript
 
-Languages: nodejs, javascript
+Languages: nodejs

samples/bullmq-bullboard-redis/compose.yaml

@@ -14,6 +14,10 @@ services:
       - QUEUE
     depends_on:
       - redis
+    #deploy:
+    #  resources:
+    #    reservations:
+    #      memory: 256M
 
   api:
     restart: unless-stopped
@@ -29,6 +33,10 @@ services:
       - QUEUE
     depends_on:
       - redis
+    #deploy:
+    #  resources:
+    #    reservations:
+    #      memory: 256M
 
   worker:
     restart: unless-stopped
@@ -44,6 +52,10 @@ services:
       test: ["CMD", "wget", "-q", "--spider", "127.0.0.1:3000"]
     depends_on:
       - redis
+    #deploy:
+    #  resources:
+    #    reservations:
+    #      memory: 256M
 
   redisx:
     image: redis:6.2

samples/csharp-dotnet/README.md

@@ -36,6 +36,6 @@ Title: ASP.NET Core & JavaScript Task Manager
 
 Short Description: A task manager using ASP.NET Core for the backend and JavaScript for the frontend, containerized with Docker.
 
-Tags: aspnetcore, javascript, Docker
+Tags: ASP.NET Core, JavaScript, C#
 
-Languages: csharp, javascript
+Languages: C#, JavaScript

samples/csharp-dotnet/app/bin/Debug/net8.0/c#-dotnet

@@ -0,0 +1,23 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v8.0",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v8.0": {
+      "c#-dotnet/1.0.0": {
+        "runtime": {
+          "c#-dotnet.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "c#-dotnet/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}

samples/csharp-dotnet/app/bin/Debug/net8.0/c#-dotnet.deps.json

@@ -0,0 +1,12 @@
+{
+  "runtimeOptions": {
+    "tfm": "net8.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "8.0.0"
+    },
+    "configProperties": {
+      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
+    }
+  }
+}