Skip to content

Commit 3f1e625

Browse files
raphaeltmraphaeltm
committed
Merge branch 'jordan/rails' of github.com:DefangLabs/samples into jordan/rails
2 parents b349051 + 29796be commit 3f1e625

File tree

127 files changed

+3624
-1111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+3624
-1111
lines changed

‎.github/workflows/check-sample.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
- name: Run Checks
2222
id: checks
2323
run: |
24+
. <(curl -Ls https://s.defang.io/install)
2425
./scripts/check-sample-files.sh > checklist.txt
2526
./scripts/check-modified-samples.sh > modified.txt
2627
echo "@@ MODIFIED @@"

‎samples/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
uses: actions/checkout@v4
1818

1919
- name: Deploy
20-
uses: DefangLabs/defang-github-action@v1.0.4
20+
uses: DefangLabs/defang-github-action@v1.1.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
uses: actions/checkout@v4
1818

1919
- name: Deploy
20-
uses: DefangLabs/defang-github-action@v1.0.4
20+
uses: DefangLabs/defang-github-action@v1.1.0

‎samples/bullmq-bullboard-redis/compose.dev.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ services:
3333
- QUEUE=testqueue
3434
command: npx nodemon index.mjs
3535

36-
redis:
36+
redisx:
3737
extends:
3838
file: compose.yaml
39-
service: redis
40-
39+
service: redisx
40+

‎samples/csharp-dotnet/.github/workflows/deploy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
uses: actions/checkout@v4
1818

1919
- name: Deploy
20-
uses: DefangLabs/defang-github-action@v1.0.4
20+
uses: DefangLabs/defang-github-action@v1.1.0

‎samples/django-postgres/.github/workflows/deploy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
uses: actions/checkout@v4
1818

1919
- name: Deploy
20-
uses: DefangLabs/defang-github-action@v1.0.4
20+
uses: DefangLabs/defang-github-action@v1.1.0

‎samples/django-postgres/app/crm_platform/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
ALLOWED_HOSTS = ['*']
3030

3131
CSRF_TRUSTED_ORIGINS = [
32-
'https://*.prod1.defang.dev',
32+
'https://*.defang.dev',
3333
'http://localhost:8000',
3434
]
3535

‎samples/django/.github/workflows/deploy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
uses: actions/checkout@v4
1818

1919
- name: Deploy
20-
uses: DefangLabs/defang-github-action@v1.0.4
20+
uses: DefangLabs/defang-github-action@v1.1.0

‎samples/django/app/defang_sample/settings.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@
131131

132132
# CSRF
133133
CSRF_TRUSTED_ORIGINS = [
134-
'https://*.prod1.defang.dev'
134+
'https://*.defang.dev'
135135
]
136136

137137
if DEBUG:
138138
CSRF_TRUSTED_ORIGINS = [
139139
'http://localhost:8000',
140-
]
140+
]

0 commit comments

Comments
 (0)