Merge pull request #1860 from Shuffle/snyk-fix-22eb3d596fd554b90a36a3cd63bff74d

[Snyk] Security upgrade nginx from 1.29.0 to 1.29.3
This commit is contained in:
Frikky
2025-11-12 11:38:29 +01:00
committed by GitHub
3 changed files with 5 additions and 3 deletions
+2
View File
@@ -96,6 +96,8 @@ SHUFFLE_WORKER_SERVER_URL=
SHUFFLE_ORBORUS_PULL_TIME= SHUFFLE_ORBORUS_PULL_TIME=
# Max recursion depth for subflows # Max recursion depth for subflows
SHUFFLE_MAX_EXECUTION_DEPTH= SHUFFLE_MAX_EXECUTION_DEPTH=
# Amount of app replicas
SHUFFLE_APP_REPLICAS=3
# DATABASE CONFIGURATIONS # DATABASE CONFIGURATIONS
DATASTORE_EMULATOR_HOST=shuffle-database:8000 DATASTORE_EMULATOR_HOST=shuffle-database:8000
+2 -2
View File
@@ -42,8 +42,6 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
environment: environment:
- SHUFFLE_APP_SDK_TIMEOUT=300 - SHUFFLE_APP_SDK_TIMEOUT=300
- SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY=7 # The amount of concurrent executions Orborus can handle.
#- DOCKER_HOST=tcp://docker-socket-proxy:2375
- ENVIRONMENT_NAME=Shuffle - ENVIRONMENT_NAME=Shuffle
- ORG_ID=Shuffle - ORG_ID=Shuffle
- BASE_URL=http://${OUTER_HOSTNAME}:5001 - BASE_URL=http://${OUTER_HOSTNAME}:5001
@@ -52,9 +50,11 @@ services:
- HTTPS_PROXY=${HTTPS_PROXY} - HTTPS_PROXY=${HTTPS_PROXY}
- SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY} - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
- SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY} - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
- SHUFFLE_APP_REPLICAS=${SHUFFLE_APP_REPLICAS}
- SHUFFLE_STATS_DISABLED=true - SHUFFLE_STATS_DISABLED=true
- SHUFFLE_LOGS_DISABLED=true - SHUFFLE_LOGS_DISABLED=true
- SHUFFLE_SWARM_CONFIG=run - SHUFFLE_SWARM_CONFIG=run
- SHUFFLE_APP_REPLICAS=3
- CLEANUP=false - CLEANUP=false
- SHUFFLE_WORKER_IMAGE=ghcr.io/shuffle/shuffle-worker:latest - SHUFFLE_WORKER_IMAGE=ghcr.io/shuffle/shuffle-worker:latest
env_file: .env env_file: .env
Executable → Regular
+1 -1
View File
@@ -27,7 +27,7 @@ COPY ./*.json /usr/src/app/
RUN npm run build --loglevel verbose 2>&1 RUN npm run build --loglevel verbose 2>&1
# Production environment # Production environment
FROM nginx:1.29.0 FROM nginx:1.29.3
RUN mkdir -p /usr/share/nginx/html/build RUN mkdir -p /usr/share/nginx/html/build
RUN mkdir -p /usr/share/nginx/html/css RUN mkdir -p /usr/share/nginx/html/css