More subflow fixes

2023-04-13 15:37:22 +02:00
parent 274a942e88
commit 27457637c1
8 changed files with 83 additions and 71 deletions
@@ -1,69 +1,69 @@
 version: '3'
 services:
-  frontend:
-    image: ghcr.io/shuffle/shuffle-frontend:latest
-    container_name: shuffle-frontend
-    hostname: shuffle-frontend
-    ports:
-      - "${FRONTEND_PORT}:80"
-      - "${FRONTEND_PORT_HTTPS}:443"
-    networks:
-      - shuffle
-    environment:
-      - BACKEND_HOSTNAME=${BACKEND_HOSTNAME}
-    restart: unless-stopped
-    depends_on:
-      - backend
-  backend:
-    image: ghcr.io/shuffle/shuffle-backend:latest
-    container_name: shuffle-backend
-    hostname: ${BACKEND_HOSTNAME}
-    # Here for debugging:
-    ports:
-      - "${BACKEND_PORT}:5001"
-    networks:
-      - shuffle
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${SHUFFLE_APP_HOTLOAD_LOCATION}:/shuffle-apps:z
-      - ${SHUFFLE_FILE_LOCATION}:/shuffle-files:z
-    env_file: .env
-    environment:
-      #- DOCKER_HOST=tcp://docker-socket-proxy:2375
-      - SHUFFLE_APP_HOTLOAD_FOLDER=/shuffle-apps
-      - SHUFFLE_FILE_LOCATION=/shuffle-files
-    restart: unless-stopped
-  orborus:
-    image: ghcr.io/shuffle/shuffle-orborus:latest
-    container_name: shuffle-orborus
-    hostname: shuffle-orborus
-    networks:
-      - shuffle
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      #- DOCKER_HOST=tcp://docker-socket-proxy:2375
-      - SHUFFLE_WORKER_VERSION=latest
-      - ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
-      - BASE_URL=http://${OUTER_HOSTNAME}:5001
-      - DOCKER_API_VERSION=1.40
-      - SHUFFLE_BASE_IMAGE_NAME=${SHUFFLE_BASE_IMAGE_NAME}
-      - SHUFFLE_BASE_IMAGE_REGISTRY=${SHUFFLE_BASE_IMAGE_REGISTRY}
-      - SHUFFLE_BASE_IMAGE_TAG_SUFFIX=${SHUFFLE_BASE_IMAGE_TAG_SUFFIX}
-      - HTTP_PROXY=${HTTP_PROXY}
-      - HTTPS_PROXY=${HTTPS_PROXY}
-      - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
-      - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
-    restart: unless-stopped
-    security_opt:
-      - seccomp:unconfined
+  #frontend:
+  #  image: ghcr.io/shuffle/shuffle-frontend:latest
+  #  container_name: shuffle-frontend
+  #  hostname: shuffle-frontend
+  #  ports:
+  #    - "${FRONTEND_PORT}:80"
+  #    - "${FRONTEND_PORT_HTTPS}:443"
+  #  networks:
+  #    - shuffle
+  #  environment:
+  #    - BACKEND_HOSTNAME=${BACKEND_HOSTNAME}
+  #  restart: unless-stopped
+  #  depends_on:
+  #    - backend
+  #backend:
+  #  image: ghcr.io/shuffle/shuffle-backend:latest
+  #  container_name: shuffle-backend
+  #  hostname: ${BACKEND_HOSTNAME}
+  #  # Here for debugging:
+  #  ports:
+  #    - "${BACKEND_PORT}:5001"
+  #  networks:
+  #    - shuffle
+  #  volumes:
+  #    - /var/run/docker.sock:/var/run/docker.sock
+  #    - ${SHUFFLE_APP_HOTLOAD_LOCATION}:/shuffle-apps:z
+  #    - ${SHUFFLE_FILE_LOCATION}:/shuffle-files:z
+  #  env_file: .env
+  #  environment:
+  #    #- DOCKER_HOST=tcp://docker-socket-proxy:2375
+  #    - SHUFFLE_APP_HOTLOAD_FOLDER=/shuffle-apps
+  #    - SHUFFLE_FILE_LOCATION=/shuffle-files
+  #  restart: unless-stopped
+  #orborus:
+  #  image: ghcr.io/shuffle/shuffle-orborus:latest
+  #  container_name: shuffle-orborus
+  #  hostname: shuffle-orborus
+  #  networks:
+  #    - shuffle
+  #  volumes:
+  #    - /var/run/docker.sock:/var/run/docker.sock
+  #  environment:
+  #    #- DOCKER_HOST=tcp://docker-socket-proxy:2375
+  #    - SHUFFLE_WORKER_VERSION=latest
+  #    - ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
+  #    - BASE_URL=http://${OUTER_HOSTNAME}:5001
+  #    - DOCKER_API_VERSION=1.40
+  #    - SHUFFLE_BASE_IMAGE_NAME=${SHUFFLE_BASE_IMAGE_NAME}
+  #    - SHUFFLE_BASE_IMAGE_REGISTRY=${SHUFFLE_BASE_IMAGE_REGISTRY}
+  #    - SHUFFLE_BASE_IMAGE_TAG_SUFFIX=${SHUFFLE_BASE_IMAGE_TAG_SUFFIX}
+  #    - HTTP_PROXY=${HTTP_PROXY}
+  #    - HTTPS_PROXY=${HTTPS_PROXY}
+  #    - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
+  #    - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
+  #  restart: unless-stopped
+  #  security_opt:
+  #    - seccomp:unconfined
  opensearch:
    image: opensearchproject/opensearch:2.5.0
    hostname: shuffle-opensearch
    container_name: shuffle-opensearch
    environment:
      - bootstrap.memory_lock=true
-      - "OPENSEARCH_JAVA_OPTS=-Xms2048m -Xmx2048m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
+      - "OPENSEARCH_JAVA_OPTS=-Xms1048m -Xmx1048m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
      - cluster.initial_master_nodes=shuffle-opensearch
      - cluster.routing.allocation.disk.threshold_enabled=false
      - cluster.name=shuffle-cluster