paulmataruso/wazuh-docker-orginal
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-11-04 14:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.6.0' into merge-4.6.0-into-4.7.0

Browse Source
This commit is contained in:
David Correa Rodríguez
2023-09-22 12:07:13 +02:00
parent 149df5e492 536dd51aa7
commit 7312f86235
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-docker-images/wazuh-dashboard/Dockerfile
View File

@@ -66,6 +66,8 @@ ENV PATTERN="" \
EXTENSIONS_CISCAT="" \ EXTENSIONS_CISCAT="" \
EXTENSIONS_AWS="" \ EXTENSIONS_AWS="" \
EXTENSIONS_GCP="" \ EXTENSIONS_GCP="" \
EXTENSIONS_GITHUB=""\
EXTENSIONS_OFFICE=""\
EXTENSIONS_VIRUSTOTAL="" \ EXTENSIONS_VIRUSTOTAL="" \
EXTENSIONS_OSQUERY="" \ EXTENSIONS_OSQUERY="" \
EXTENSIONS_DOCKER="" \ EXTENSIONS_DOCKER="" \

2
build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
View File

@@ -25,6 +25,8 @@ declare -A CONFIG_MAP=(
[extensions.ciscat]=$EXTENSIONS_CISCAT [extensions.ciscat]=$EXTENSIONS_CISCAT
[extensions.aws]=$EXTENSIONS_AWS [extensions.aws]=$EXTENSIONS_AWS
[extensions.gcp]=$EXTENSIONS_GCP [extensions.gcp]=$EXTENSIONS_GCP
[extensions.github]=$EXTENSIONS_GITHUB
[extensions.office]=$EXTENSIONS_OFFICE
[extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL [extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL
[extensions.osquery]=$EXTENSIONS_OSQUERY [extensions.osquery]=$EXTENSIONS_OSQUERY
[extensions.docker]=$EXTENSIONS_DOCKER [extensions.docker]=$EXTENSIONS_DOCKER

4
build-docker-images/wazuh-manager/Dockerfile
View File

@@ -5,7 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
ARG WAZUH_VERSION ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION ARG WAZUH_TAG_REVISION
ARG TEMPLATE_VERSION=4.7 ARG TEMPLATE_VERSION=v4.7.0
ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2 ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz" ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
@@ -54,4 +54,4 @@ RUN chmod 755 /permanent_data.sh && \
# Services ports # Services ports
EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp
ENTRYPOINT [ "/init" ] ENTRYPOINT [ "/init" ]

4
build-docker-images/wazuh-manager/config/create_user.py
View File

@@ -13,7 +13,7 @@ SPECIAL_CHARS = "@$!%*?&-_"
try: try:
from wazuh.rbac.orm import create_rbac_db from wazuh.rbac.orm import check_database_integrity
from wazuh.security import ( from wazuh.security import (
create_user, create_user,
get_users, get_users,
@@ -69,7 +69,7 @@ if __name__ == "__main__":
username, password = read_user_file() username, password = read_user_file()
# create RBAC database # create RBAC database
create_rbac_db() check_database_integrity()
initial_users = db_users() initial_users = db_users()
if username not in initial_users: if username not in initial_users: