mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-11-03 21:43:15 +00:00 
			
		
		
		
	lock elk to 5.1.2
This commit is contained in:
		@@ -8,27 +8,32 @@ services:
 | 
				
			|||||||
      - "1515:1515"
 | 
					      - "1515:1515"
 | 
				
			||||||
      - "514/udp:514/udp"
 | 
					      - "514/udp:514/udp"
 | 
				
			||||||
      - "55000:55000"
 | 
					      - "55000:55000"
 | 
				
			||||||
#    networks:
 | 
					    networks:
 | 
				
			||||||
#      - docker_elk
 | 
					      - docker_elk
 | 
				
			||||||
 | 
					#    volumes:
 | 
				
			||||||
 | 
					#      - volume-path:/var/ossec/etc/data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
      - elasticsearch
 | 
					      - elasticsearch
 | 
				
			||||||
  elasticsearch:
 | 
					  elasticsearch:
 | 
				
			||||||
    image: elasticsearch:latest
 | 
					    image: elasticsearch:5.1.2
 | 
				
			||||||
    command: elasticsearch -E node.name="node-1" -E cluster.name="wazuh " -E network.host=0.0.0.0
 | 
					    command: elasticsearch -E node.name="node-1" -E cluster.name="wazuh " -E network.host=0.0.0.0
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - "9200:9200"
 | 
					      - "9200:9200"
 | 
				
			||||||
      - "9300:9300"
 | 
					      - "9300:9300"
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      ES_JAVA_OPTS: "-Xms1g -Xmx1g"
 | 
					      ES_JAVA_OPTS: "-Xms3g -Xmx3g"
 | 
				
			||||||
#    networks:
 | 
					#    volumes:
 | 
				
			||||||
#      - docker_elk
 | 
					#      - volume-path:/usr/share/elasticsearch/data
 | 
				
			||||||
 | 
					    networks:
 | 
				
			||||||
 | 
					      - docker_elk
 | 
				
			||||||
  logstash:
 | 
					  logstash:
 | 
				
			||||||
    build: logstash/
 | 
					    build: logstash/
 | 
				
			||||||
    command: -f /etc/logstash/conf.d/
 | 
					    command: -f /etc/logstash/conf.d/
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - "5000:5000"
 | 
					      - "5000:5000"
 | 
				
			||||||
#    networks:
 | 
					    networks:
 | 
				
			||||||
#      - docker_elk
 | 
					      - docker_elk
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
      - elasticsearch
 | 
					      - elasticsearch
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
@@ -37,12 +42,12 @@ services:
 | 
				
			|||||||
    build: kibana/
 | 
					    build: kibana/
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - "5601:5601"
 | 
					      - "5601:5601"
 | 
				
			||||||
#    networks:
 | 
					    networks:
 | 
				
			||||||
#      - docker_elk
 | 
					      - docker_elk
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
      - elasticsearch
 | 
					      - elasticsearch
 | 
				
			||||||
    entrypoint: sh wait-for-it.sh elasticsearch
 | 
					    entrypoint: sh wait-for-it.sh elasticsearch
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#networks:
 | 
					networks:
 | 
				
			||||||
#  docker_elk:
 | 
					  docker_elk:
 | 
				
			||||||
#    driver: bridge
 | 
					    driver: bridge
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
FROM logstash:latest
 | 
					FROM logstash:5.1.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN apt-get update
 | 
					RUN apt-get update
 | 
				
			||||||
RUN groupadd -g 1000 ossec && useradd -u 1000 -g 1000 ossec &&\
 | 
					RUN groupadd -g 1000 ossec && useradd -u 1000 -g 1000 ossec &&\
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,15 +0,0 @@
 | 
				
			|||||||
#!/bin/bash
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
set -e
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
host="$1"
 | 
					 | 
				
			||||||
shift
 | 
					 | 
				
			||||||
cmd="$@"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
until curl -XGET $host:9200; do
 | 
					 | 
				
			||||||
  >&2 echo "Elastic is unavailable - sleeping"
 | 
					 | 
				
			||||||
  sleep 1
 | 
					 | 
				
			||||||
done
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
>&2 echo "Elastic is up - executing command"
 | 
					 | 
				
			||||||
exec $cmd
 | 
					 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
FROM centos
 | 
					FROM centos:latest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY config/*.repo /etc/yum.repos.d/
 | 
					COPY config/*.repo /etc/yum.repos.d/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,5 +3,5 @@ gpgcheck=1
 | 
				
			|||||||
gpgkey=https://packages.wazuh.com/key/GPG-KEY-WAZUH
 | 
					gpgkey=https://packages.wazuh.com/key/GPG-KEY-WAZUH
 | 
				
			||||||
enabled=1
 | 
					enabled=1
 | 
				
			||||||
name=CENTOS-$releasever - Wazuh
 | 
					name=CENTOS-$releasever - Wazuh
 | 
				
			||||||
baseurl=https://packages.wazuh.com/yum/el/$releasever/$basearch
 | 
					baseurl=http://packages.wazuh.com.s3-website-us-west-1.amazonaws.com/yum/el/$releasever/$basearch
 | 
				
			||||||
protect=1
 | 
					protect=1
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user