tum 1 mese fa
parent
commit
7efe524391
2 ha cambiato i file con 6 aggiunte e 2 eliminazioni
  1. 3 1
      Shuffle/.env
  2. 3 1
      Shuffle/docker-compose.yml

+ 3 - 1
Shuffle/.env

44
 # CHANGE THIS IF YOU WANT GOOD LOCAL EXECUTIONS:
44
 # CHANGE THIS IF YOU WANT GOOD LOCAL EXECUTIONS:
45
 OUTER_HOSTNAME=shuffle-backend
45
 OUTER_HOSTNAME=shuffle-backend
46
 DB_LOCATION=./shuffle-database
46
 DB_LOCATION=./shuffle-database
47
-DOCKER_API_VERSION=1.40
47
+DOCKER_API_VERSION=1.44
48
 
48
 
49
 # Orborus/Proxy configurations
49
 # Orborus/Proxy configurations
50
 HTTP_PROXY=
50
 HTTP_PROXY=
111
 SHUFFLE_OPENSEARCH_USERNAME="admin"
111
 SHUFFLE_OPENSEARCH_USERNAME="admin"
112
 SHUFFLE_OPENSEARCH_PASSWORD="StrongShufflePassword321!" # In use for the first time setup of OpenSearch + backend of Shuffle
112
 SHUFFLE_OPENSEARCH_PASSWORD="StrongShufflePassword321!" # In use for the first time setup of OpenSearch + backend of Shuffle
113
 OPENSEARCH_INITIAL_ADMIN_PASSWORD="StrongShufflePassword321!" # In use for the first time setup of OpenSearch
113
 OPENSEARCH_INITIAL_ADMIN_PASSWORD="StrongShufflePassword321!" # In use for the first time setup of OpenSearch
114
+SHUFFLE_SKIP_PIPELINES=true
115
+SHUFFLE_PIPELINE_ENABLED=false
114
 
116
 
115
 #Tenzir related
117
 #Tenzir related
116
 SHUFFLE_TENZIR_URL=
118
 SHUFFLE_TENZIR_URL=

+ 3 - 1
Shuffle/docker-compose.yml

45
       - ENVIRONMENT_NAME=Shuffle
45
       - ENVIRONMENT_NAME=Shuffle
46
       - ORG_ID=Shuffle
46
       - ORG_ID=Shuffle
47
       - BASE_URL=http://${OUTER_HOSTNAME}:5001
47
       - BASE_URL=http://${OUTER_HOSTNAME}:5001
48
-      - DOCKER_API_VERSION=1.40
48
+      - DOCKER_API_VERSION=${DOCKER_API_VERSION:-1.44}
49
       - HTTP_PROXY=${HTTP_PROXY}
49
       - HTTP_PROXY=${HTTP_PROXY}
50
       - HTTPS_PROXY=${HTTPS_PROXY}
50
       - HTTPS_PROXY=${HTTPS_PROXY}
51
       - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
51
       - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
52
       - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
52
       - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
53
+      - SHUFFLE_SKIP_PIPELINES=${SHUFFLE_SKIP_PIPELINES:-true}
54
+      - SHUFFLE_PIPELINE_ENABLED=${SHUFFLE_PIPELINE_ENABLED:-false}
53
       # - SHUFFLE_APP_REPLICAS=${SHUFFLE_APP_REPLICAS}
55
       # - SHUFFLE_APP_REPLICAS=${SHUFFLE_APP_REPLICAS}
54
       - SHUFFLE_STATS_DISABLED=true
56
       - SHUFFLE_STATS_DISABLED=true
55
       - SHUFFLE_LOGS_DISABLED=true
57
       - SHUFFLE_LOGS_DISABLED=true