merge main

Author: raphaeltm

.github/workflows/check-sample.yml

@@ -25,6 +25,7 @@ jobs:
       - name: Run Checks
         id: checks
         run: |
+          . <(curl -Ls https://s.defang.io/install)
           ./scripts/check-sample-files.sh > checklist.txt
           ./scripts/check-modified-samples.sh > modified.txt
           echo "@@ MODIFIED @@"

samples/.gitignore

@@ -0,0 +1,2 @@
+
+FROM mcr.microsoft.com/devcontainers/typescript-node:22-bookworm

samples/angular-express/.devcontainer/Dockerfile

@@ -0,0 +1,11 @@
+{
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": ".."
+  },
+  "features": {
+    "ghcr.io/defanglabs/devcontainer-feature/defang-cli:1.0.4": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+    "ghcr.io/devcontainers/features/aws-cli:1": {}
+  }
+}

samples/angular-express/.devcontainer/devcontainer.json

@@ -17,4 +17,4 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Deploy
-      uses: DefangLabs/defang-github-action@v1.0.4
+      uses: DefangLabs/defang-github-action@v1.1.0

samples/angular-express/.github/workflows/deploy.yaml

@@ -31,7 +31,7 @@ This sample showcases how you could deploy a full-stack application with Angular
 
 For development, we use two local containers, one for the frontend Angular service and one for the backend service in Express. It also uses Caddy as a web server for serving static files. To run the sample locally after cloning the repository, you can run on Docker by doing:
 
-1. `docker compose -f compose.dev.yaml up`
+1. `docker compose -f compose.dev.yaml up --build`
 
 ---
 

samples/angular-express/README.md

@@ -0,0 +1,2 @@
+
+FROM mcr.microsoft.com/devcontainers/typescript-node:22-bookworm

samples/bullmq-bullboard-redis/.devcontainer/Dockerfile

@@ -0,0 +1,11 @@
+{
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": ".."
+  },
+  "features": {
+    "ghcr.io/defanglabs/devcontainer-feature/defang-cli:1.0.4": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+    "ghcr.io/devcontainers/features/aws-cli:1": {}
+  }
+}

samples/bullmq-bullboard-redis/.devcontainer/devcontainer.json

@@ -17,4 +17,4 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Deploy
-      uses: DefangLabs/defang-github-action@v1.0.4
+      uses: DefangLabs/defang-github-action@v1.1.0

samples/bullmq-bullboard-redis/.github/workflows/deploy.yaml

@@ -24,7 +24,7 @@ The `worker` service is the queue processor that will process the jobs added to
 
 ## Local Development
 
-1. Run `docker compose -f compose.dev.yaml up`
+1. Run `docker compose -f compose.dev.yaml up --build`
 
 ---