mirror of
https://github.com/utopia-os/utopia-ui.git
synced 2026-03-01 12:44:17 +00:00
Merge branch 'main' into e2e-bdt
This commit is contained in:
commit
43f6693cbe
7
.github/workflows/test.backend.seed.yml
vendored
7
.github/workflows/test.backend.seed.yml
vendored
@ -29,6 +29,11 @@ jobs:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
|
||||
with:
|
||||
node-version-file: '.tool-versions'
|
||||
|
||||
- name: Build Docker Production
|
||||
run: |
|
||||
mkdir -p ./data/uploads
|
||||
@ -51,4 +56,4 @@ jobs:
|
||||
#
|
||||
# - name: Build Docker Development
|
||||
# run: docker compose build
|
||||
# working-directory: ${{env.WORKING_DIRECTORY}}
|
||||
# working-directory: ${{env.WORKING_DIRECTORY}}
|
||||
|
||||
@ -7,6 +7,6 @@ RUN npm install
|
||||
RUN mkdir -p ./directus
|
||||
RUN cd node_modules && find . -maxdepth 1 -type d -name "directus-extension-*" -exec mv {} ../directus \;
|
||||
|
||||
FROM directus/directus:11.7.2
|
||||
FROM directus/directus:11.9.3
|
||||
# Copy third party extensions
|
||||
COPY --from=third-party-ext /extensions/directus ./extensions
|
||||
1
backend/directus-config/.gitignore
vendored
1
backend/directus-config/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/*
|
||||
!development/
|
||||
**/specs/
|
||||
!.gitignore
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": 1,
|
||||
"directus": "11.7.2",
|
||||
"directus": "11.9.3",
|
||||
"vendor": "postgres"
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
31
docker-compose.override.yml.dist
Normal file
31
docker-compose.override.yml.dist
Normal file
@ -0,0 +1,31 @@
|
||||
services:
|
||||
app:
|
||||
restart: unless-stopped
|
||||
database:
|
||||
restart: unless-stopped
|
||||
cache:
|
||||
restart: unless-stopped
|
||||
backend:
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
PUBLIC_URL: 'https://DOMAIN/api'
|
||||
|
||||
SECRET: 'TODO'
|
||||
|
||||
CORS_ORIGIN: 'array:http://localhost:8080,http://localhost:5174,https://DOMAIN'
|
||||
PASSWORD_RESET_URL_ALLOW_LIST: "https://DOMAIN/set-new-password/"
|
||||
|
||||
ADMIN_EMAIL: 'TODO'
|
||||
ADMIN_PASSWORD: 'TODO'
|
||||
|
||||
EMAIL_FROM: 'TODO'
|
||||
EMAIL_TRANSPORT: "smtp"
|
||||
EMAIL_SMTP_HOST: "MAILSERVER"
|
||||
EMAIL_SMTP_PORT: "465"
|
||||
EMAIL_SMTP_POOL: false
|
||||
EMAIL_SMTP_SECURE: true
|
||||
EMAIL_VERIFY_SETUP: true
|
||||
EMAIL_SMTP_IGNORE_TLS: true
|
||||
EMAIL_SMTP_TLS: true
|
||||
EMAIL_SMTP_TLS_REJECT_UNAUTHORIZED: false
|
||||
EMAIL_SMTP_NAME: "EMAILNAME"
|
||||
@ -1,7 +1,6 @@
|
||||
services:
|
||||
app:
|
||||
image: cupcakearmy/static
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- 8080:80
|
||||
volumes:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user