mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-11-04 05:53:19 +00:00 
			
		
		
		
	Add tag revision for Wazuh indexer and dashboard
This commit is contained in:
		@@ -1,5 +1,6 @@
 | 
			
		||||
WAZUH_IMAGE_VERSION=4.3.5
 | 
			
		||||
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
 | 
			
		||||
WAZUH_TAG_REVISION=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- | sed -e 's/\.//g')
 | 
			
		||||
 | 
			
		||||
## If wazuh manager exists in apt dev repository, change variables, if not, exit 1
 | 
			
		||||
@@ -11,5 +12,6 @@ fi
 | 
			
		||||
 | 
			
		||||
echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env
 | 
			
		||||
echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env
 | 
			
		||||
echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> .env
 | 
			
		||||
 | 
			
		||||
docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache
 | 
			
		||||
@@ -6,7 +6,8 @@ services:
 | 
			
		||||
    build:
 | 
			
		||||
      context: wazuh-manager/
 | 
			
		||||
      args:
 | 
			
		||||
        - WAZUH_VERSION=${WAZUH_VERSION}
 | 
			
		||||
        WAZUH_VERSION: ${WAZUH_VERSION}
 | 
			
		||||
        WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
 | 
			
		||||
    image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION}
 | 
			
		||||
    hostname: wazuh.manager
 | 
			
		||||
    restart: always
 | 
			
		||||
@@ -37,7 +38,8 @@ services:
 | 
			
		||||
    build:
 | 
			
		||||
      context: wazuh-indexer/
 | 
			
		||||
      args:
 | 
			
		||||
        - WAZUH_VERSION=${WAZUH_VERSION}
 | 
			
		||||
        WAZUH_VERSION: ${WAZUH_VERSION}
 | 
			
		||||
        WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
 | 
			
		||||
    image: wazuh/wazuh-indexer:${WAZUH_IMAGE_VERSION}
 | 
			
		||||
    hostname: wazuh.indexer
 | 
			
		||||
    restart: always
 | 
			
		||||
@@ -57,7 +59,8 @@ services:
 | 
			
		||||
    build:
 | 
			
		||||
      context: wazuh-dashboard/
 | 
			
		||||
      args:
 | 
			
		||||
        - WAZUH_VERSION=${WAZUH_VERSION}
 | 
			
		||||
        WAZUH_VERSION: ${WAZUH_VERSION}
 | 
			
		||||
        WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
 | 
			
		||||
    image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION}
 | 
			
		||||
    hostname: wazuh.dashboard
 | 
			
		||||
    restart: always
 | 
			
		||||
 
 | 
			
		||||
@@ -2,6 +2,7 @@
 | 
			
		||||
FROM ubuntu:focal AS builder
 | 
			
		||||
 | 
			
		||||
ARG WAZUH_VERSION
 | 
			
		||||
ARG WAZUH_TAG_REVISION
 | 
			
		||||
ARG INSTALL_DIR=/usr/share/wazuh-dashboard
 | 
			
		||||
ARG WAZUH_UI_REVISION=1
 | 
			
		||||
 | 
			
		||||
@@ -12,8 +13,8 @@ RUN apt-get update && apt install curl libcap2-bin xz-utils -y
 | 
			
		||||
RUN mkdir -p $INSTALL_DIR
 | 
			
		||||
 | 
			
		||||
# Download and extract Wazuh dashboard base
 | 
			
		||||
RUN curl -o wazuh-dashboard-base.tar.xz https://packages.wazuh.com/stack/dashboard/base/wazuh-dashboard-base-${WAZUH_VERSION}-linux-x64.tar.xz && \
 | 
			
		||||
    tar -xf wazuh-dashboard-base.tar.xz --directory  $INSTALL_DIR --strip-components=1
 | 
			
		||||
COPY config/dl_base.sh .
 | 
			
		||||
RUN bash dl_base.sh
 | 
			
		||||
 | 
			
		||||
# Generate certificates
 | 
			
		||||
COPY config/config.sh .
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										12
									
								
								build-docker-images/wazuh-dashboard/config/dl_base.sh
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								build-docker-images/wazuh-dashboard/config/dl_base.sh
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,12 @@
 | 
			
		||||
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g') && \
 | 
			
		||||
WAZUH_IMAGE_VERSION=$(echo $WAZUH_VERSION | sed -e 's/\.//g') && \
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
if [ "$WAZUH_IMAGE_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then
 | 
			
		||||
 REPOSITORY="packages.wazuh.com"
 | 
			
		||||
else 
 | 
			
		||||
 REPOSITORY="packages-dev.wazuh.com"
 | 
			
		||||
fi
 | 
			
		||||
 
 | 
			
		||||
curl -o wazuh-dashboard-base.tar.xz https://${REPOSITORY}/stack/dashboard/base/wazuh-dashboard-base-${WAZUH_VERSION}-${WAZUH_TAG_REVISION}-linux-x64.tar.xz
 | 
			
		||||
tar -xf wazuh-dashboard-base.tar.xz --directory  $INSTALL_DIR --strip-components=1
 | 
			
		||||
@@ -2,6 +2,7 @@
 | 
			
		||||
FROM ubuntu:focal AS builder
 | 
			
		||||
 | 
			
		||||
ARG WAZUH_VERSION
 | 
			
		||||
ARG WAZUH_TAG_REVISION
 | 
			
		||||
 | 
			
		||||
RUN apt-get update -y && apt-get install curl openssl xz-utils -y
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -4,11 +4,13 @@ export DH_OPTIONS
 | 
			
		||||
 | 
			
		||||
export NAME=wazuh-indexer
 | 
			
		||||
export TARGET_DIR=${CURDIR}/debian/${NAME}
 | 
			
		||||
export WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
 | 
			
		||||
export WAZUH_IMAGE_VERSION=$(echo $WAZUH_VERSION | sed -e 's/\.//g')
 | 
			
		||||
 | 
			
		||||
# Package build options
 | 
			
		||||
export USER=${NAME}
 | 
			
		||||
export GROUP=${NAME}
 | 
			
		||||
export VERSION=${WAZUH_VERSION}
 | 
			
		||||
export VERSION=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
 | 
			
		||||
export LOG_DIR=/var/log/${NAME}
 | 
			
		||||
export LIB_DIR=/var/lib/${NAME}
 | 
			
		||||
export PID_DIR=/run/${NAME}
 | 
			
		||||
@@ -19,10 +21,15 @@ export INDEXER_FILE=wazuh-indexer-base.tar.xz
 | 
			
		||||
export BASE_FILE=wazuh-indexer-base-${VERSION}-linux-x64.tar.xz
 | 
			
		||||
export REPO_DIR=/unattended_installer
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
rm -rf ${INSTALLATION_DIR}/
 | 
			
		||||
 | 
			
		||||
curl -o ${INDEXER_FILE} https://packages.wazuh.com/stack/indexer/base/${BASE_FILE}
 | 
			
		||||
if [ "$WAZUH_IMAGE_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then
 | 
			
		||||
 REPOSITORY="packages.wazuh.com"
 | 
			
		||||
else
 | 
			
		||||
 REPOSITORY="packages-dev.wazuh.com"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
curl -o ${INDEXER_FILE} https://${REPOSITORY}/stack/indexer/base/${BASE_FILE}
 | 
			
		||||
tar -xf ${INDEXER_FILE}
 | 
			
		||||
 | 
			
		||||
## TOOLS
 | 
			
		||||
 
 | 
			
		||||
@@ -4,6 +4,7 @@ FROM ubuntu:focal
 | 
			
		||||
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 | 
			
		||||
 | 
			
		||||
ARG WAZUH_VERSION
 | 
			
		||||
ARG WAZUH_TAG_REVISION
 | 
			
		||||
ARG TEMPLATE_VERSION=4.3
 | 
			
		||||
ARG FILEBEAT_CHANNEL=filebeat-oss
 | 
			
		||||
ARG FILEBEAT_VERSION=7.10.2
 | 
			
		||||
@@ -17,7 +18,7 @@ RUN chmod 775 /check_repository.sh
 | 
			
		||||
RUN source /check_repository.sh
 | 
			
		||||
 | 
			
		||||
RUN apt-get update && \
 | 
			
		||||
    apt-get install wazuh-manager=${WAZUH_VERSION}-1
 | 
			
		||||
    apt-get install wazuh-manager=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
 | 
			
		||||
 | 
			
		||||
RUN 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 && \
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user