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

Merge pull request #1224 from wazuh/change/1210-change-the-base-image-to-amazon-linux-2023

Browse Source 
Changed the base image to Amazon Linux 2023
This commit is contained in:
Gonzalo Acuña
2024-02-22 16:12:48 -03:00
committed by GitHub
parent 1046a3a13e 0bb7a00125
commit 23900dbcc1
6 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) # 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_VERSION
ARG WAZUH_TAG_REVISION ARG WAZUH_TAG_REVISION
@@ -7,7 +7,7 @@ ARG INSTALL_DIR=/usr/share/wazuh-dashboard
ARG WAZUH_UI_REVISION ARG WAZUH_UI_REVISION
# Update and install dependencies # 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 # Create Install dir
RUN mkdir -p $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 entrypoint
# Add wazuh_app_config # Add wazuh_app_config
################################################################################ ################################################################################
FROM ubuntu:jammy FROM amazonlinux:2023.3.20240131.0
# Set environment variables # Set environment variables
ENV USER="wazuh-dashboard" \ ENV USER="wazuh-dashboard" \
@@ -80,6 +80,9 @@ ENV PATTERN="" \
WAZUH_MONITORING_SHARDS="" \ WAZUH_MONITORING_SHARDS="" \
WAZUH_MONITORING_REPLICAS="" WAZUH_MONITORING_REPLICAS=""
# Update and install dependencies
RUN yum install shadow-utils -y
# Create wazuh-dashboard user and group # Create wazuh-dashboard user and group
RUN getent group $GROUP || groupadd -r -g 1000 $GROUP RUN getent group $GROUP || groupadd -r -g 1000 $GROUP
RUN useradd --system \ RUN useradd --system \

9
build-docker-images/wazuh-indexer/Dockerfile
View File

@@ -1,10 +1,10 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) # 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_VERSION
ARG WAZUH_TAG_REVISION 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 findutils shadow-utils -y
COPY config/opensearch.yml / COPY config/opensearch.yml /
@@ -27,14 +27,17 @@ RUN bash config.sh
# #
# Copy wazuh-indexer from stage 0 # Copy wazuh-indexer from stage 0
# Add entrypoint # Add entrypoint
################################################################################ ################################################################################
FROM ubuntu:jammy FROM amazonlinux:2023.3.20240131.0
ENV USER="wazuh-indexer" \ ENV USER="wazuh-indexer" \
GROUP="wazuh-indexer" \ GROUP="wazuh-indexer" \
NAME="wazuh-indexer" \ NAME="wazuh-indexer" \
INSTALL_DIR="/usr/share/wazuh-indexer" INSTALL_DIR="/usr/share/wazuh-indexer"
RUN yum install curl-minimal shadow-utils findutils hostname -y
RUN getent group $GROUP || groupadd -r -g 1000 $GROUP RUN getent group $GROUP || groupadd -r -g 1000 $GROUP
RUN useradd --system \ RUN useradd --system \

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

@@ -1,5 +1,5 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) # 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 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 WAZUH_FILEBEAT_MODULE
ARG S6_VERSION="v2.2.0.3" ARG S6_VERSION="v2.2.0.3"
RUN apt-get update && apt install curl apt-transport-https lsb-release xz-utils gnupg -y &&\ RUN yum install curl-minimal xz gnupg tar gzip openssl findutils procps -y &&\
apt autoremove && apt clean yum clean all
COPY config/check_repository.sh / COPY config/check_repository.sh /
COPY config/filebeat_module.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 chmod 775 /check_repository.sh
RUN source /check_repository.sh RUN source /check_repository.sh
RUN apt-get update && \ RUN yum install wazuh-manager-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
apt-get install wazuh-manager=${WAZUH_VERSION}-${WAZUH_TAG_REVISION} && \ yum clean all && \
apt autoremove && apt clean && \
chmod 775 /filebeat_module.sh && \ chmod 775 /filebeat_module.sh && \
source /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 \ curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz \

14
build-docker-images/wazuh-manager/config/check_repository.sh
View File

@@ -1,7 +1,7 @@
## variables ## variables
GPG_SIGN='[arch=amd64 signed-by=/etc/apt/keyrings/wazuh.gpg]'
APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH 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-) 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) MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2) 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 ## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH 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 elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH 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 elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH 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 fi
fi fi
curl ${APT_KEY} | gpg --dearmor -o /etc/apt/keyrings/wazuh.gpg rpm --import "${APT_KEY}"
echo ${REPOSITORY} | tee -a /etc/apt/sources.list.d/wazuh.list echo -e "${REPOSITORY}" | tee /etc/yum.repos.d/wazuh.repo

5
build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
View File

@@ -184,8 +184,9 @@ set_rids_owner() {
############################################################################## ##############################################################################
set_correct_permOwner() { set_correct_permOwner() {
find / -group 997 -exec chown :101 {} +; find / -group 997 -exec chown :999 {} +;
find / -user 999 -exec chown 101 {} +; find / -group 101 -exec chown :999 {} +;
find / -user 101 -exec chown 999 {} +;
} }
############################################################################## ##############################################################################

4
build-docker-images/wazuh-manager/config/filebeat_module.sh
View File

@@ -20,6 +20,6 @@ elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
fi fi
fi fi
curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb &&\ curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm &&\
dpkg -i ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && \ 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 curl -s https://${REPOSITORY}/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module