From 98037bf25c51994832bf58dad24a4d82d42a163c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 20 Feb 2024 10:33:29 +0100 Subject: [PATCH 1/5] Commands and dependencies adapted --- build-docker-images/wazuh-dashboard/Dockerfile | 9 ++++++--- build-docker-images/wazuh-indexer/Dockerfile | 9 +++++---- build-docker-images/wazuh-manager/Dockerfile | 11 +++++------ .../wazuh-manager/config/check_repository.sh | 14 +++++++------- .../wazuh-manager/config/filebeat_module.sh | 4 ++-- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index d430ea82..542d46ca 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -1,5 +1,5 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) -FROM ubuntu:jammy AS builder +FROM amazonlinux:2023.3.20240131.0 AS builder ARG WAZUH_VERSION ARG WAZUH_TAG_REVISION @@ -7,7 +7,7 @@ ARG INSTALL_DIR=/usr/share/wazuh-dashboard ARG WAZUH_UI_REVISION # Update and install dependencies -RUN apt-get update && apt install curl libcap2-bin xz-utils -y +RUN yum install curl-minimal libcap xz tar openssl -y # Create Install dir RUN mkdir -p $INSTALL_DIR @@ -42,7 +42,7 @@ RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chown -R 101:101 $INSTALL_DIR/data/ # Add entrypoint # Add wazuh_app_config ################################################################################ -FROM ubuntu:jammy +FROM amazonlinux:2023.3.20240131.0 # Set environment variables ENV USER="wazuh-dashboard" \ @@ -80,6 +80,9 @@ ENV PATTERN="" \ WAZUH_MONITORING_SHARDS="" \ WAZUH_MONITORING_REPLICAS="" +# Update and install dependencies +RUN yum install shadow-utils -y + # Create wazuh-dashboard user and group RUN getent group $GROUP || groupadd -r -g 1000 $GROUP RUN useradd --system \ diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile index abb95e22..c0eba57a 100644 --- a/build-docker-images/wazuh-indexer/Dockerfile +++ b/build-docker-images/wazuh-indexer/Dockerfile @@ -1,10 +1,10 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) -FROM ubuntu:jammy AS builder +FROM amazonlinux:2023.3.20240131.0 AS builder ARG WAZUH_VERSION ARG WAZUH_TAG_REVISION -RUN apt-get update -y && apt-get install curl openssl xz-utils -y +RUN yum install curl-minimal openssl xz tar shadow-utils -y COPY config/opensearch.yml / @@ -27,15 +27,16 @@ RUN bash config.sh # # Copy wazuh-indexer from stage 0 # Add entrypoint + ################################################################################ -FROM ubuntu:jammy +FROM amazonlinux:2023.3.20240131.0 ENV USER="wazuh-indexer" \ GROUP="wazuh-indexer" \ NAME="wazuh-indexer" \ INSTALL_DIR="/usr/share/wazuh-indexer" -RUN apt-get update -y && apt-get install curl -y +RUN yum install curl-minimal shadow-utils -y RUN getent group $GROUP || groupadd -r -g 1000 $GROUP diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 9fcefd5d..f4e277b1 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -1,5 +1,5 @@ # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) -FROM ubuntu:jammy +FROM amazonlinux:2023.3.20240131.0 RUN rm /bin/sh && ln -s /bin/bash /bin/sh @@ -11,8 +11,8 @@ ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_FILEBEAT_MODULE ARG S6_VERSION="v2.2.0.3" -RUN apt-get update && apt install curl apt-transport-https lsb-release xz-utils gnupg -y &&\ - apt autoremove && apt clean +RUN yum install curl-minimal xz gnupg tar gzip -y &&\ + yum clean all COPY config/check_repository.sh / COPY config/filebeat_module.sh / @@ -21,9 +21,8 @@ COPY config/permanent_data.env config/permanent_data.sh / RUN chmod 775 /check_repository.sh RUN source /check_repository.sh -RUN apt-get update && \ - apt-get install wazuh-manager=${WAZUH_VERSION}-${WAZUH_TAG_REVISION} && \ - apt autoremove && apt clean && \ +RUN yum install wazuh-manager-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \ + yum clean all && \ chmod 775 /filebeat_module.sh && \ source /filebeat_module.sh && \ curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz \ diff --git a/build-docker-images/wazuh-manager/config/check_repository.sh b/build-docker-images/wazuh-manager/config/check_repository.sh index bd7ffea9..6c3748c5 100644 --- a/build-docker-images/wazuh-manager/config/check_repository.sh +++ b/build-docker-images/wazuh-manager/config/check_repository.sh @@ -1,7 +1,7 @@ ## variables -GPG_SIGN='[arch=amd64 signed-by=/etc/apt/keyrings/wazuh.gpg]' APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH -REPOSITORY="deb ${GPG_SIGN} https://packages.wazuh.com/4.x/apt/ stable main" +GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]" +REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1" WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-) MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1) MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2) @@ -13,18 +13,18 @@ MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3) ## check version to use the correct repository if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="deb ${GPG_SIGN} https://packages-dev.wazuh.com/pre-release/apt/ unstable main" + REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="deb ${GPG_SIGN} https://packages-dev.wazuh.com/pre-release/apt/ unstable main" + REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH - REPOSITORY="deb ${GPG_SIGN} https://packages-dev.wazuh.com/pre-release/apt/ unstable main" + REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1" fi fi fi -curl ${APT_KEY} | gpg --dearmor -o /etc/apt/keyrings/wazuh.gpg -echo ${REPOSITORY} | tee -a /etc/apt/sources.list.d/wazuh.list \ No newline at end of file +rpm --import "${APT_KEY}" +echo -e "${REPOSITORY}" | tee /etc/yum.repos.d/wazuh.repo \ No newline at end of file diff --git a/build-docker-images/wazuh-manager/config/filebeat_module.sh b/build-docker-images/wazuh-manager/config/filebeat_module.sh index 3ca1b183..e3647720 100644 --- a/build-docker-images/wazuh-manager/config/filebeat_module.sh +++ b/build-docker-images/wazuh-manager/config/filebeat_module.sh @@ -20,6 +20,6 @@ elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then fi fi -curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb &&\ -dpkg -i ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && \ +curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm &&\ +yum install -y ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm && \ curl -s https://${REPOSITORY}/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module \ No newline at end of file From a4a9207dec2b6e64bbe1d9130f5418d0bac4d1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 20 Feb 2024 12:23:41 +0100 Subject: [PATCH 2/5] Added findutils dependency to indexer --- build-docker-images/wazuh-indexer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile index c0eba57a..2dae543d 100644 --- a/build-docker-images/wazuh-indexer/Dockerfile +++ b/build-docker-images/wazuh-indexer/Dockerfile @@ -4,7 +4,7 @@ FROM amazonlinux:2023.3.20240131.0 AS builder ARG WAZUH_VERSION ARG WAZUH_TAG_REVISION -RUN yum install curl-minimal openssl xz tar shadow-utils -y +RUN yum install curl-minimal openssl xz tar findutils shadow-utils -y COPY config/opensearch.yml / From 4ba6e124b1a82058599614f5f1e417afce0ab79f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 20 Feb 2024 17:37:40 +0100 Subject: [PATCH 3/5] Updated dependencies --- build-docker-images/wazuh-indexer/Dockerfile | 2 +- build-docker-images/wazuh-manager/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile index 2dae543d..28ec68ba 100644 --- a/build-docker-images/wazuh-indexer/Dockerfile +++ b/build-docker-images/wazuh-indexer/Dockerfile @@ -36,7 +36,7 @@ ENV USER="wazuh-indexer" \ NAME="wazuh-indexer" \ INSTALL_DIR="/usr/share/wazuh-indexer" -RUN yum install curl-minimal shadow-utils -y +RUN yum install curl-minimal shadow-utils findutils hostname -y RUN getent group $GROUP || groupadd -r -g 1000 $GROUP diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index f4e277b1..07658a5a 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -11,7 +11,7 @@ ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_FILEBEAT_MODULE ARG S6_VERSION="v2.2.0.3" -RUN yum install curl-minimal xz gnupg tar gzip -y &&\ +RUN yum install curl-minimal xz gnupg tar gzip openssl findutils -y &&\ yum clean all COPY config/check_repository.sh / From 55f9fe3dede714c257d9c32586875b884846b22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 21 Feb 2024 17:51:36 +0100 Subject: [PATCH 4/5] Added procps to Manager dockerfile --- build-docker-images/wazuh-manager/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 07658a5a..a0c57183 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -11,7 +11,7 @@ ARG FILEBEAT_VERSION=7.10.2 ARG WAZUH_FILEBEAT_MODULE ARG S6_VERSION="v2.2.0.3" -RUN yum install curl-minimal xz gnupg tar gzip openssl findutils -y &&\ +RUN yum install curl-minimal xz gnupg tar gzip openssl findutils procps -y &&\ yum clean all COPY config/check_repository.sh / From 467a405754ebe1bbeb22739b20e748aee90361b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 22 Feb 2024 17:51:47 +0100 Subject: [PATCH 5/5] Upgraded ownership files for Wazuh files --- .../wazuh-manager/config/etc/cont-init.d/0-wazuh-init | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init index ea1ab5f0..dae0e1f0 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init @@ -184,8 +184,9 @@ set_rids_owner() { ############################################################################## set_correct_permOwner() { - find / -group 997 -exec chown :101 {} +; - find / -user 999 -exec chown 101 {} +; + find / -group 997 -exec chown :999 {} +; + find / -group 101 -exec chown :999 {} +; + find / -user 101 -exec chown 999 {} +; } ##############################################################################