dsdsf

docker/docker-compose-dev.yml

@@ -1,72 +1,58 @@
-version: '3.2'
-
+version: "3.1"
 services:
-  elasticsearch:
-    build:
-      context: elasticsearch/
-      args:
-        ELK_VERSION: $ELK_VERSION
-    volumes:
-      - type: bind
-        source: ./elasticsearch/config/elasticsearch.yml
-        target: /usr/share/elasticsearch/config/elasticsearch.yml
-        read_only: true
-      - type: volume
-        source: elasticsearch
-        target: /usr/share/elasticsearch/data
+  bro-nginx:
+    image: nginx:alpine
+    container_name: bro-nginx
     ports:
-      - "9200:9200"
-      - "9300:9300"
-    environment:
-      ES_JAVA_OPTS: "-Xmx256m -Xms256m"
-      ELASTIC_PASSWORD: dkrnffkwjdghk
-      # Use single node discovery in order to disable production mode and avoid bootstrap checks.
-      # see: https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html
-      discovery.type: single-node
-
-  logstash:
-    build:
-      context: logstash/
-      args:
-        ELK_VERSION: $ELK_VERSION
+      - "32100:80"
+      - "449"
     volumes:
-      - type: bind
-        source: ./logstash/config/logstash.yml
-        target: /usr/share/logstash/config/logstash.yml
-        read_only: true
-      - type: bind
-        source: ./logstash/pipeline
-        target: /usr/share/logstash/pipeline
-        read_only: true
-    ports:
-      - "5044:5044"
-      - "5000:5000/tcp"
-      - "5000:5000/udp"
-      - "9600:9600"
-    environment:
-      LS_JAVA_OPTS: "-Xmx256m -Xms256m"    
+      - ./nginx/spiduler.conf:/etc/nginx/conf.d/default.conf
+    restart: unless-stopped    
     depends_on:
-      - elasticsearch
+      - bro-gateway
 
-  kibana:
-    build:
-      context: kibana/
-      args:
-        ELK_VERSION: $ELK_VERSION
+  bro-gateway:
+    image: node:lts-alpine
+    container_name: bro-gateway
     volumes:
-      - type: bind
-        source: ./kibana/config/kibana.yml
-        target: /usr/share/kibana/config/kibana.yml
-        read_only: true
-    ports:
-      - "5601:5601"    
+      - ../../:/var/www/spiduler
+    entrypoint: node /var/www/spiduler/bro-app-gateway
+    restart: unless-stopped     
+
+  bro-browser: 
+    image: node:lts-alpine    
+    container_name: bro-browser
+    volumes:
+      - ../../:/var/www/spiduler
+    entrypoint: node /var/www/spiduler/bro-app-browser
+    restart: unless-stopped    
     depends_on:
-      - elasticsearch
+      - bro-nginx
+      - bro-chrome
+
+  bro-tor:
+    image: dperson/torproxy
+    container_name: bro-tor    
+    hostname: bro-tor      
+    privileged: true
+    shm_size: 2g
+    restart: unless-stopped    
+
+  bro-chrome:
+    image: selenium/standalone-chrome
+    container_name: bro-chrome    
+    hostname: bro-chrome  
+    privileged: true
+    shm_size: 2g
+    restart: unless-stopped    
+    # environment: 
+      # - HUB_HOST=bro-chrome
+      # - HUB_PORT=4444
+      # - JAVA_OPTS=-Dwebdriver.chrome.whitelistedIps=
+      #   - SE_OPTS=-debug            
+
 
 networks:
   default:      
     name: bro
-    external: true
-
-volumes:
-  elasticsearch:

docker/elk/docker-compose.yml

@@ -23,8 +23,6 @@ services:
       # Use single node discovery in order to disable production mode and avoid bootstrap checks.
       # see: https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html
       discovery.type: single-node
-    networks:
-      - elk
 
   logstash:
     build:
@@ -47,8 +45,6 @@ services:
       - "9600:9600"
     environment:
       LS_JAVA_OPTS: "-Xmx256m -Xms256m"    
-    networks:
-      - elk
     depends_on:
       - elasticsearch
 
@@ -64,14 +60,13 @@ services:
         read_only: true
     ports:
       - "5601:5601"    
-    networks:
-      - elk
     depends_on:
       - elasticsearch
 
 networks:
-  elk:
-    driver: bridge
+  default:
+    name: bro
+    external: true
 
 volumes:
   elasticsearch: