Merge branch 'jordan/rails' of github.com:DefangLabs/samples into jor…

…dan/rails
DefangLabs · Sep 19, 2024 · 3f1e625 · 3f1e625
2 parents b349051 + 29796be
commit 3f1e625
Show file tree

Hide file tree

Showing 127 changed files with 3,624 additions and 1,111 deletions.
diff --git a/.github/workflows/check-sample.yml b/.github/workflows/check-sample.yml
@@ -21,6 +21,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 @@"

diff --git a/samples/.gitignore b/samples/.gitignore
diff --git a/samples/angular-express/.github/workflows/deploy.yaml b/samples/angular-express/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/bullmq-bullboard-redis/.github/workflows/deploy.yaml b/samples/bullmq-bullboard-redis/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/bullmq-bullboard-redis/compose.dev.yaml b/samples/bullmq-bullboard-redis/compose.dev.yaml
@@ -33,8 +33,8 @@ services:
       - QUEUE=testqueue
     command: npx nodemon index.mjs
 
-  redis:
+  redisx:
     extends:
       file: compose.yaml
-      service: redis
-
+      service: redisx
+
diff --git a/samples/csharp-dotnet/.github/workflows/deploy.yaml b/samples/csharp-dotnet/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/django-postgres/.github/workflows/deploy.yaml b/samples/django-postgres/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/django-postgres/app/crm_platform/settings.py b/samples/django-postgres/app/crm_platform/settings.py
@@ -29,7 +29,7 @@
 ALLOWED_HOSTS = ['*']
 
 CSRF_TRUSTED_ORIGINS = [
-    'https://*.prod1.defang.dev',
+    'https://*.defang.dev',
     'http://localhost:8000',
 ]
 

diff --git a/samples/django/.github/workflows/deploy.yaml b/samples/django/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/django/app/defang_sample/settings.py b/samples/django/app/defang_sample/settings.py
@@ -131,10 +131,10 @@
 
 # CSRF
 CSRF_TRUSTED_ORIGINS = [
-    'https://*.prod1.defang.dev'
+    'https://*.defang.dev'
 ]
 
 if DEBUG:
     CSRF_TRUSTED_ORIGINS = [
         'http://localhost:8000',
-    ]
+    ]
diff --git a/samples/elysia/.github/workflows/deploy.yaml b/samples/elysia/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/fastapi-postgres/.github/workflows/deploy.yaml b/samples/fastapi-postgres/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/fastapi/.github/workflows/deploy.yaml b/samples/fastapi/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/feathersjs/.github/workflows/deploy.yaml b/samples/feathersjs/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/flask/.github/workflows/deploy.yaml b/samples/flask/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/golang-http-form/.github/workflows/deploy.yaml b/samples/golang-http-form/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/golang-http/.github/workflows/deploy.yaml b/samples/golang-http/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/golang-mongodb-atlas/.github/workflows/deploy.yaml b/samples/golang-mongodb-atlas/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/golang-openai/.github/workflows/deploy.yaml b/samples/golang-openai/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/golang-rest-api/.github/workflows/deploy.yaml b/samples/golang-rest-api/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/golang-s3/.github/workflows/deploy.yaml b/samples/golang-s3/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/golang-slackbot/.github/workflows/deploy.yaml b/samples/golang-slackbot/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/hasura/.github/workflows/deploy.yaml b/samples/hasura/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/huginn/.github/workflows/deploy.yaml b/samples/huginn/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/imgproxy/.github/workflows/deploy.yaml b/samples/imgproxy/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/javalin/.github/workflows/deploy.yaml b/samples/javalin/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/langchain/.github/workflows/deploy.yaml b/samples/langchain/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/metabase/.github/workflows/deploy.yaml b/samples/metabase/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/nextjs-blog/.github/workflows/deploy.yaml b/samples/nextjs-blog/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/nextjs-boilerplate/.github/workflows/deploy.yaml b/samples/nextjs-boilerplate/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/nextjs-documentation/.github/workflows/deploy.yaml b/samples/nextjs-documentation/.github/workflows/deploy.yaml
@@ -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
diff --git a/samples/nextjs-github-actions/README.md b/samples/nextjs-github-actions/README.md
diff --git a/samples/nextjs-github-actions/compose.yaml b/samples/nextjs-github-actions/compose.yaml
diff --git a/samples/nextjs-postgres/.devcontainer/Dockerfile b/samples/nextjs-postgres/.devcontainer/Dockerfile
@@ -0,0 +1 @@
+FROM mcr.microsoft.com/devcontainers/typescript-node:22-bookworm
diff --git a/samples/nextjs-postgres/.devcontainer/devcontainer.json b/samples/nextjs-postgres/.devcontainer/devcontainer.json
@@ -0,0 +1,10 @@
+{
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": ".."
+  },
+  "features": {
+    "ghcr.io/defanglabs/devcontainer-feature/defang-cli:1.0.4": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+  }
+}
diff --git a/samples/nextjs-postgres/.github/workflows/deploy.yaml b/samples/nextjs-postgres/.github/workflows/deploy.yaml
@@ -0,0 +1,24 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+
+    - name: Deploy
+      uses: DefangLabs/[email protected]
+      with:
+        config-env-vars: POSTGRES_PASSWORD
+      env:
+        POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
diff --git a/samples/nextjs-postgres/README.md b/samples/nextjs-postgres/README.md
@@ -0,0 +1,44 @@
+# Next.js & Postgres
+
+[![1-click-deploy](https://defang.io/deploy-with-defang.png)](https://portal.defang.dev/redirect?url=https%3A%2F%2Fgithub.com%2Fnew%3Ftemplate_name%3Dsample-nextjs-postgres-template%26template_owner%3DDefangSamples)
+
+This is a sample Next.js application that uses Postgres as a database. It is a simple example that demonstrates how to connect to a Postgres database from a Next.js application: on each request it takes the user's IP address, geo-locates it, and stores the result in the database, then displays the last 20 results on the home page.
+
+## Prerequisites
+
+1. Download [Defang CLI](https://github.com/DefangLabs/defang)
+2. (Optional) If you are using [Defang BYOC](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html) authenticated with your AWS account
+3. (Optional for local development) [Docker CLI](https://docs.docker.com/engine/install/)
+
+## Development
+
+To run the application locally, you can use the following command:
+
+```bash
+docker compose -f compose.dev.yaml up
+```
+
+## Configuration
+
+For this sample, you will need to provide the following [configuration](https://docs.defang.io/docs/concepts/configuration). Note that if you are using the 1-click deploy option, you can set these values as secrets in your GitHub repository and the action will automatically deploy them for you.
+
+### `POSTGRES_PASSWORD`
+A password that will be used to connect to the Postgres database.
+
+
+## Deploying
+
+1. Open the terminal and type `defang login`
+2. Use the [`defang config`](https://docs.defang.io/docs/concepts/compose#configuration) command to setup environment variables.
+3. Type `defang compose up` in the CLI.
+4. Your app will be running within a few minutes.
+
+---
+
+Title: Next.js & Postgres
+
+Short Description: A sample Next.js application that uses Postgres as a database.
+
+Tags: Next.js, Postgres, Database, Node.js
+
+Languages: TypeScript, JavaScript
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		FROM mcr.microsoft.com/devcontainers/typescript-node:22-bookworm