git push origin launch
Merge branch 'azgaviperr-launch' into launch
This commit is contained in:
@@ -22,7 +22,7 @@ require (
|
||||
github.com/docker/go-units v0.4.0 // indirect
|
||||
github.com/elastic/go-elasticsearch/v7 v7.13.1 // indirect
|
||||
github.com/frikky/kin-openapi v0.40.0
|
||||
github.com/frikky/shuffle-shared v0.0.81
|
||||
github.com/frikky/shuffle-shared v0.0.82
|
||||
github.com/fsouza/go-dockerclient v1.7.2
|
||||
github.com/ghodss/yaml v1.0.0
|
||||
github.com/go-git/go-billy/v5 v5.0.0
|
||||
|
||||
+10
-25
@@ -16,7 +16,7 @@ services:
|
||||
depends_on:
|
||||
- backend
|
||||
backend:
|
||||
build: ./backend
|
||||
#build: ./backend
|
||||
image: ghcr.io/frikky/shuffle-backend:nightly
|
||||
container_name: shuffle-backend
|
||||
hostname: ${BACKEND_HOSTNAME}
|
||||
@@ -25,18 +25,18 @@ services:
|
||||
- "${BACKEND_PORT}:5001"
|
||||
networks:
|
||||
- shuffle
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
- ${SHUFFLE_APP_HOTLOAD_LOCATION}:/shuffle-apps
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
- ${SHUFFLE_APP_HOTLOAD_LOCATION}:/shuffle-apps
|
||||
- ${SHUFFLE_FILE_LOCATION}:/shuffle-files
|
||||
#- ${SHUFFLE_OPENSEARCH_CERTIFICATE_FILE}:/shuffle-files/es_certificate
|
||||
env_file: .env
|
||||
env_file: .env
|
||||
environment:
|
||||
- SHUFFLE_APP_HOTLOAD_FOLDER=/shuffle-apps
|
||||
- SHUFFLE_FILE_LOCATION=/shuffle-files
|
||||
restart: unless-stopped
|
||||
#depends_on:
|
||||
#- opensearch
|
||||
#- opensearch
|
||||
#- database
|
||||
orborus:
|
||||
#build: ./functions/onprem/orborus
|
||||
@@ -66,13 +66,13 @@ services:
|
||||
- CLEANUP=${SHUFFLE_CONTAINER_AUTO_CLEANUP}
|
||||
restart: unless-stopped
|
||||
opensearch:
|
||||
image: opensearchproject/opensearch:1.0.0-beta1
|
||||
image: opensearchproject/opensearch:1.0.0
|
||||
hostname: shuffle-opensearch
|
||||
container_name: shuffle-opensearch
|
||||
environment:
|
||||
- bootstrap.memory_lock=true
|
||||
- bootstrap.memory_lock=true
|
||||
- "OPENSEARCH_JAVA_OPTS=-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
|
||||
- opendistro_security.disabled=true
|
||||
- plugins.security.disabled=true
|
||||
- cluster.routing.allocation.disk.threshold_enabled=false
|
||||
- cluster.name=shuffle-cluster
|
||||
- node.name=shuffle-opensearch
|
||||
@@ -83,7 +83,7 @@ services:
|
||||
soft: -1
|
||||
hard: -1
|
||||
nofile:
|
||||
soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems
|
||||
soft: 65536
|
||||
hard: 65536
|
||||
volumes:
|
||||
- ${DB_LOCATION}:/usr/share/opensearch/data:rw
|
||||
@@ -92,21 +92,6 @@ services:
|
||||
networks:
|
||||
- shuffle
|
||||
restart: unless-stopped
|
||||
#database:
|
||||
# #build: ./backend/database
|
||||
# image: frikky/shuffle:database
|
||||
# container_name: shuffle-database
|
||||
# hostname: shuffle-database
|
||||
# ports:
|
||||
# - "8000:8000"
|
||||
# networks:
|
||||
# - shuffle
|
||||
# environment:
|
||||
# - _JAVA_OPTIONS="-Xmx2g"
|
||||
# restart: unless-stopped
|
||||
# volumes:
|
||||
# - ${DB_LOCATION}:/etc/shuffle
|
||||
|
||||
networks:
|
||||
shuffle:
|
||||
driver: bridge
|
||||
|
||||
Reference in New Issue
Block a user