modify conflict

Shuffle/.env

@@ -44,7 +44,7 @@ AUTH_FOR_ORBORUS=
 # CHANGE THIS IF YOU WANT GOOD LOCAL EXECUTIONS:
 OUTER_HOSTNAME=shuffle-backend
 DB_LOCATION=./shuffle-database
-DOCKER_API_VERSION=1.40
+DOCKER_API_VERSION=1.44
 
 # Orborus/Proxy configurations
 HTTP_PROXY=
@@ -111,6 +111,8 @@ SHUFFLE_OPENSEARCH_SKIPSSL_VERIFY=true
 SHUFFLE_OPENSEARCH_USERNAME="admin"
 SHUFFLE_OPENSEARCH_PASSWORD="StrongShufflePassword321!" # In use for the first time setup of OpenSearch + backend of Shuffle
 OPENSEARCH_INITIAL_ADMIN_PASSWORD="StrongShufflePassword321!" # In use for the first time setup of OpenSearch
+SHUFFLE_SKIP_PIPELINES=true
+SHUFFLE_PIPELINE_ENABLED=false
 
 #Tenzir related
 SHUFFLE_TENZIR_URL=

Shuffle/docker-compose.yml

@@ -45,11 +45,13 @@ services:
       - ENVIRONMENT_NAME=Shuffle
       - ORG_ID=Shuffle
       - BASE_URL=http://${OUTER_HOSTNAME}:5001
-      - DOCKER_API_VERSION=1.40
+      - DOCKER_API_VERSION=${DOCKER_API_VERSION:-1.44}
       - HTTP_PROXY=${HTTP_PROXY}
       - HTTPS_PROXY=${HTTPS_PROXY}
       - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
       - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
+      - SHUFFLE_SKIP_PIPELINES=${SHUFFLE_SKIP_PIPELINES:-true}
+      - SHUFFLE_PIPELINE_ENABLED=${SHUFFLE_PIPELINE_ENABLED:-false}
       # - SHUFFLE_APP_REPLICAS=${SHUFFLE_APP_REPLICAS}
       - SHUFFLE_STATS_DISABLED=true
       - SHUFFLE_LOGS_DISABLED=true