Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deployment/enterprise/.sso.env.template
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ NEXTAUTH_ACL=
NEXTAUTH_ADMIN_CREDENTIALS=admin@boxy.com:boxy

# Add some not real domain here. It will be used for SAML application initialization. For more details see: https://www.ory.sh/docs/polis/deploy/env-variables#saml_audience
SAML_AUDIENCE=https://saml.example.com
SAML_AUDIENCE=https://saml.merginmaps.com

# Chnage in production to real domain where Polis will be deployed
EXTERNAL_URL=http://localhost:8081
Expand Down
8 changes: 4 additions & 4 deletions deployment/enterprise/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ networks:

services:
server:
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.0.beta.1
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.0
container_name: merginmaps-server
restart: always
user: 901:999
Expand All @@ -21,7 +21,7 @@ services:
networks:
- mergin
web:
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.5.0.beta.1
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.5.0
container_name: merginmaps-web
restart: always
depends_on:
Expand Down Expand Up @@ -51,7 +51,7 @@ services:
- server

celery-beat:
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.0.beta.1
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.0
container_name: merginmaps-celery-beat
restart: always
user: 901:999
Expand All @@ -67,7 +67,7 @@ services:
- mergin

celery-worker:
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.0.beta.1
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.0
container_name: merginmaps-celery-worker
restart: always
user: 901:999
Expand Down
Loading