updated docker-compose

Author: sabaanwar

README.md

@@ -1,15 +1,13 @@
 # SCoT
-
-SCoT (Sense Clustering over Time) is a web application to view the senses of a word and their evolvement over time.
+SCoT (Sense Clustering over Time) is a web application to view the senses of a word and their evolvement over time. 
 
 You will find a detailed explanation of the theoretical background, the architecture and usage examples in the following paper
 Haase, Anwar, Yimam, Friedrich, Biemann (2021 - under consideration for EACL - Demo Paper)
 https://www.dropbox.com/s/fqgwatcjhweryqi/Haase_Anwar_Yimam_Friedrich_Biemann_SCoT_2021.pdf?dl=0
 
-This is the second version of the tool, which has been fundamentally revised from the first version that was initially developed by
+This is the second version of the tool, which has been fundamentally revised from the first version that was initially developed by 
 Kempfert, Anwar, Yimam and Biemann. The revisions include:
-
-- a fully revised and new graph-model of so-called Neighbourhood Graphs over Time, including new graph-building algorithms, stemming from Haase's MA Thesis
+- a fully revised and new graph-model of so-called Neighbourhood Graphs over Time, including new graph-building algorithms, stemming from Haase's MA Thesis 
 - a fully new designed frontend
 - a fully revised new architecture of the application, including a new MVVM-frontend-component-layering (Vue.js) and a three-layer backend (Python)
 - the ability to include features from multiple DTs and full text search via SQL and ElasticSearch-Databases
@@ -23,3 +21,7 @@ https://youtu.be/SbmfA4hKjvg
 If you have any questions, please do not hesitate emailing me at haase[at]informatik.uni-hamburg.de
 
 Best, Christian Haase, Lead Dev Version 2
+
+
+
+

docker-compose.yml

@@ -1,10 +1,10 @@
 version: "2.1"
-# networks:
-#   scot-net:
+networks:
+  scott-net:
 services:
   app:
     #build: ./src_vue
-    image: uhhlt/scottest
+    image: uhhlt/scott
     volumes:
       - ./src_vue/config:/app/config
       - ./src_vue/persistence:/app/persistence
@@ -13,49 +13,58 @@ services:
       - ./src_vue/static:/app/static
     # depends_on:
     #   - elasticsearch_780
-    # links:
-    #   - db
+    links:
+      - db
     ports:
       - "10020:80"
-    # networks:
-    #   scot-net:
+    networks:
+      scott-net:
 
-#   db:
-#     image: mariadb:10.5.4
-#     container_name: mariadb_1054
-#     volumes:
-#       # database - this can be combined with environment [implicit start-up scrip1] to source one db [useful for very large dumps as here]
-#       - ${PWD}/db/dump.sql:/docker-entrypoint-initdb.d/dump.sql
-#       #  Permanent volume not needed - as the data does not change
-#       - ${PWD}/db/dev_data:/var/lib/mysql
-#       # SECOND START-UP SCRIPT VIA scripts in entrypoint folder
-#       # all scripts in this folder are copied somewhere - thus do NOT reference other files in them - use USE db; - execution lexically
-#       #- ${PWD}/db/init/init_dev:/docker-entrypoint-initdb.d
-#
-#     # environment works as a first start-up script and executes mysql commands on the docker image
-#     environment:
-#       MYSQL_ROOT_PASSWORD: root
-#       MYSQL_DATABASE: scot
-#       MYSQL_USER: user
-#       MYSQL_PASSWORD: password
-#
-#     networks:
-#       scot-net:
-#
-  # elasticsearch:
-  #   image: elasticsearch:7.8.0
-  #   container_name: elasticsearch_780
-  #   environment:
-  #     - xpack.security.enabled=false
-  #     - discovery.type=single-node
-  #     - "ES_JAVA_OPTS=-Xms16g -Xmx16g"
-  #   volumes:
-  #     - elasticsearch-data:/usr/share/elasticsearch/data
-  #   ports:
-  #     - 9292:9200
-  #     - 9393:9300
-  #   networks:
-  #     scot-net:
+  db:
+    image: mariadb:10.5.4
+    container_name: mariadb_1054
+    volumes:
+      # database - this can be combined with environment [implicit start-up scrip1] to source one db [useful for very large dumps as here]
+      - ${PWD}/db/dump.sql:/docker-entrypoint-initdb.d/dump.sql
+      #  Permanent volume not needed - as the data does not change
+      - ${PWD}/db/dev_data:/var/lib/mysql
+      # SECOND START-UP SCRIPT VIA scripts in entrypoint folder
+      # all scripts in this folder are copied somewhere - thus do NOT reference other files in them - use USE db; - execution lexically
+      #- ${PWD}/db/init/init_dev:/docker-entrypoint-initdb.d
+
+    # environment works as a first start-up script and executes mysql commands on the docker image
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: scot
+      MYSQL_USER: user
+      MYSQL_PASSWORD: password
+
+    networks:
+      scott-net:
+
+  elasticsearch:
+    image: elasticsearch:8.6.0
+    container_name: scot_elasticsearch_860
+    environment:
+      - xpack.security.enabled=false
+      - discovery.type=single-node
+      - "ES_JAVA_OPTS=-Xms16g -Xmx16g"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
+    cap_add:
+      - IPC_LOCK
+    volumes:
+      - elasticsearch_data:/usr/share/elasticsearch/data
+    ports:
+      - 9292:9200
+      - 9393:9300
+    networks:
+      scott-net:
 # volumes:
-#   elasticsearch-data:
+#   elasticsearch_data:
 #     driver: local