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
4 changes: 3 additions & 1 deletion client/src/settings/Settings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ export default function Settings() {
const handleSave = async ({ phoneNumber, ...values }) => {
try {
await dataProvider.updateSettings({ data: values });
await dataProvider.updateProfile({ data: { phoneNumber } });
if (phoneNumber !== (identity?.phoneNumber ?? '')) {
await dataProvider.updateProfile({ data: { phoneNumber } });
}
await authProvider.getIdentity(true);
notify('ההגדרות נשמרו בהצלחה', { type: 'info' });
navigate('/');
Expand Down
113 changes: 113 additions & 0 deletions docker-compose-swarm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
version: "3.8"

services:
client:
image: 'ghcr.io/buzz-code/react-admin-nestjs-client:latest'
container_name: client
depends_on:
- server
Comment on lines +6 to +8
deploy:
labels:
caddy: $DOMAIN_NAME
caddy.reverse_proxy: '{{upstreams 80}}'
caddy.reverse_proxy.health_uri: '/'
caddy.reverse_proxy.health_interval: 5s
caddy.reverse_proxy.health_timeout: 5s
placement:
constraints:
- node.labels.codeserver != true
- node.labels.listenReport != true
update_config:
parallelism: 1
delay: 10s
order: start-first
rollback_config:
parallelism: 1
delay: 5s
restart_policy:
condition: on-failure
delay: 5s
max_attempts: 3
window: 120s
healthcheck:
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:80/"]
interval: 30s
timeout: 10s
start_period: 30s
retries: 3
environment:
PORT: 80
REACT_APP_API_URL: 'https://api.$DOMAIN_NAME'
# ports:
# - '30003:80'
networks:
- private-network
- caddy
- elknet

server:
image: 'ghcr.io/buzz-code/react-admin-nestjs-server:latest'
container_name: server
deploy:
labels:
caddy: api.$DOMAIN_NAME
caddy.reverse_proxy: '{{upstreams 3000}}'
caddy.reverse_proxy.health_uri: '/health'
caddy.reverse_proxy.health_interval: 5s
caddy.reverse_proxy.health_timeout: 5s
caddy.reverse_proxy.transport: http
caddy.reverse_proxy.transport.keepalive: 30s
placement:
constraints:
- node.labels.codeserver != true
- node.labels.listenReport != true
update_config:
parallelism: 1
delay: 10s
order: start-first
rollback_config:
parallelism: 1
delay: 5s
restart_policy:
condition: on-failure
delay: 5s
max_attempts: 3
window: 120s
healthcheck:
test: ["CMD", "node", "-e", "require('http').get('http://localhost:3000/health', (r) => process.exit(r.statusCode === 200 ? 0 : 1))"]
interval: 30s
timeout: 10s
start_period: 60s
retries: 3
labels:
co.elastic.logs/enabled: 'true'
environment:
IP_ADDRESS: $IP_ADDRESS

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is used — in server/shared (the nra-server submodule), utils/bootstrap.util.ts builds the CORS allowedOrigins list from process.env.IP_ADDRESS. It's not visible in this repo's diff since the submodule content isn't part of the PR, but the app does read it at runtime. Keeping it.


Generated by Claude Code

DOMAIN_NAME: $DOMAIN_NAME
MYSQL_HOST: $MYSQL_HOST
MYSQL_USER: $MYSQL_USER
MYSQL_PASSWORD: $MYSQL_PASSWORD
MYSQL_DATABASE: $MYSQL_DATABASE
JWT_SECRET: $JWT_SECRET
ADMIN_USER: $ADMIN_USER
SMTP_USER: $SMTP_USER
SMTP_PASSWORD: $SMTP_PASSWORD
MAINTENANCE_MODE: $MAINTENANCE_MODE
MAINTENANCE_MESSAGE: $MAINTENANCE_MESSAGE
# ports:
# - '30004:3000'
networks:
- private-network
- backend-network
- caddy
- elknet


networks:
private-network:
caddy:
external: true
elknet:
external: true
backend-network:
external: true
Loading