Merge pull request #2042 from wazuh/enhancement/2040-revert-image-tag-for-4.14.0rc2

Bump 4.14.0 branch

VERSION.json

@@ -1,4 +1,4 @@
 {
     "version": "4.14.0",
-    "stage": "rc1"
+    "stage": "rc2"
 }

build-docker-images/build-images.sh

@@ -76,7 +76,7 @@ help() {
     echo
     echo "Usage: $0 [OPTIONS]"
     echo
-    echo "    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default."
+    echo "    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default."
     echo "    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default ${FILEBEAT_MODULE_VERSION}."
     echo "    -r, --revision <rev>         [Optional] Package revision. By default ${WAZUH_TAG_REVISION}"
     echo "    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, ${WAZUH_IMAGE_VERSION}."

build-docker-images/build-images.yml

@@ -8,7 +8,7 @@ services:
         WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
         FILEBEAT_TEMPLATE_BRANCH: ${FILEBEAT_TEMPLATE_BRANCH}
         WAZUH_FILEBEAT_MODULE: ${WAZUH_FILEBEAT_MODULE}
-    image: merecu/wazuh-manager:${WAZUH_IMAGE_VERSION}
+    image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION}
     hostname: wazuh.manager
     restart: always
     ports:
@@ -40,7 +40,7 @@ services:
       args:
         WAZUH_VERSION: ${WAZUH_VERSION}
         WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
-    image: merecu/wazuh-agent:${WAZUH_IMAGE_VERSION}
+    image: wazuh/wazuh-agent:${WAZUH_IMAGE_VERSION}
     hostname: wazuh.agent
     restart: always
 
@@ -50,7 +50,7 @@ services:
       args:
         WAZUH_VERSION: ${WAZUH_VERSION}
         WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
-    image: merecu/wazuh-indexer:${WAZUH_IMAGE_VERSION}
+    image: wazuh/wazuh-indexer:${WAZUH_IMAGE_VERSION}
     hostname: wazuh.indexer
     restart: always
     ports:
@@ -72,7 +72,7 @@ services:
         WAZUH_VERSION: ${WAZUH_VERSION}
         WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
         WAZUH_UI_REVISION: ${WAZUH_UI_REVISION}
-    image: merecu/wazuh-dashboard:${WAZUH_IMAGE_VERSION}
+    image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION}
     hostname: wazuh.dashboard
     restart: always
     ports:

build-docker-images/wazuh-dashboard/Dockerfile

@@ -5,19 +5,16 @@ ARG WAZUH_VERSION
 ARG WAZUH_TAG_REVISION
 ARG WAZUH_UI_REVISION
 ARG INSTALL_DIR=/usr/share/wazuh-dashboard
-ARG REPO_ORIGIN=https://packages-dev.wazuh.com/pre-release
-ARG TARGETARCH
-ENV PKG_ARCH=${TARGETARCH}
 
 # Update and install dependencies
-RUN dnf install curl-minimal libcap openssl -y &&\
+RUN yum install curl-minimal libcap openssl -y
-    case "$PKG_ARCH" in \
+
-      amd64) ARCH_NAME="x86_64" ;; \
+COPY config/check_repository.sh /
-      arm64) ARCH_NAME="aarch64" ;; \
+RUN chmod 775 /check_repository.sh && \
-      *) echo "Unsupported arch: $PKG_ARCH" && exit 1 ;; \
+    source /check_repository.sh
-    esac && \
+
-    dnf install ${REPO_ORIGIN}/yum/wazuh-dashboard-${WAZUH_VERSION}-${WAZUH_TAG_REVISION}.${ARCH_NAME}.rpm -y && \
+RUN yum install wazuh-dashboard-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
-    dnf clean all
+    yum clean all
 
 # Create and set permissions to data directories
 RUN mkdir -p $INSTALL_DIR/data/wazuh && chmod -R 775 $INSTALL_DIR/data/wazuh
@@ -63,7 +60,7 @@ ENV PATTERN="" \
     WAZUH_MONITORING_REPLICAS=""
 
 # Update and install dependencies
-RUN dnf install shadow-utils -y
+RUN yum install shadow-utils -y
 
 # Create wazuh-dashboard user and group
 RUN getent group $GROUP || groupadd -r -g 1000 $GROUP

build-docker-images/wazuh-indexer/Dockerfile

@@ -3,18 +3,15 @@ FROM amazonlinux:2023 AS builder
 
 ARG WAZUH_VERSION
 ARG WAZUH_TAG_REVISION
-ARG REPO_ORIGIN=https://packages-dev.wazuh.com/pre-release
-ARG TARGETARCH
-ENV PKG_ARCH=${TARGETARCH}
 
-RUN dnf install curl-minimal openssl xz tar findutils shadow-utils -y &&\
+RUN yum install curl-minimal openssl xz tar findutils shadow-utils -y
-    case "$PKG_ARCH" in \
+
-      amd64) ARCH_NAME="x86_64" ;; \
+COPY config/check_repository.sh /
-      arm64) ARCH_NAME="aarch64" ;; \
+RUN chmod 775 /check_repository.sh && \
-      *) echo "Unsupported arch: $PKG_ARCH" && exit 1 ;; \
+    source /check_repository.sh
-    esac && \
+
-    dnf install ${REPO_ORIGIN}/yum/wazuh-indexer-${WAZUH_VERSION}-${WAZUH_TAG_REVISION}.${ARCH_NAME}.rpm -y && \
+RUN yum install wazuh-indexer-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
-    dnf clean all
+    yum clean all
 
 COPY config/opensearch.yml /
 

build-docker-images/wazuh-manager/Dockerfile

@@ -11,22 +11,19 @@ ARG FILEBEAT_VERSION=7.10.2
 ARG FILEBEAT_REVISION=2
 ARG WAZUH_FILEBEAT_MODULE
 ARG S6_VERSION="v2.2.0.3"
-ARG REPO_ORIGIN=https://packages-dev.wazuh.com/pre-release
-ARG TARGETARCH
-ENV PKG_ARCH=${TARGETARCH}
 
+RUN yum install curl-minimal xz gnupg tar gzip openssl findutils procps -y &&\
+    yum clean all
+
+COPY config/check_repository.sh /
 COPY config/filebeat_module.sh /
 COPY config/permanent_data.env config/permanent_data.sh /
 
+RUN chmod 775 /check_repository.sh
+RUN source /check_repository.sh
 
-RUN dnf install curl-minimal xz gnupg tar gzip openssl findutils procps -y &&\
+RUN yum install wazuh-manager-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
-    case "$PKG_ARCH" in \
+    yum clean all && \
-      amd64) ARCH_NAME="x86_64" ;; \
-      arm64) ARCH_NAME="aarch64" ;; \
-      *) echo "Unsupported arch: $PKG_ARCH" && exit 1 ;; \
-    esac && \
-    dnf install ${REPO_ORIGIN}/yum/wazuh-manager-${WAZUH_VERSION}-${WAZUH_TAG_REVISION}.${ARCH_NAME}.rpm -y && \
-    dnf clean all && \
     chmod 775 /filebeat_module.sh && \
     source /filebeat_module.sh && \
     rm /filebeat_module.sh && \
@@ -64,6 +61,8 @@ RUN mkdir -p /var/ossec/var/multigroups && \
     sync && /permanent_data.sh && \
     sync && rm /permanent_data.sh
 
+RUN rm /etc/yum.repos.d/wazuh.repo
+
 # Services ports
 EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp
 

build-docker-images/wazuh-manager/config/filebeat_module.sh

@@ -1,5 +1,11 @@
 ## variables
+REPOSITORY="packages-dev.wazuh.com/pre-release"
 WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/'  | cut -c 11- | grep ^v${WAZUH_VERSION}$)
 
-dnf install ${REPO_ORIGIN}/yum/filebeat-${FILEBEAT_VERSION}-${FILEBEAT_REVISION}.${ARCH_NAME}.rpm -y && \
+## check tag to use the correct repository
-curl -s ${REPO_ORIGIN}/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module
+if [[ -n "${WAZUH_TAG}" ]]; then
+  REPOSITORY="packages.wazuh.com/4.x"
+fi
+
+yum install filebeat-${FILEBEAT_VERSION}-${FILEBEAT_REVISION} -y && \
+curl -s https://${REPOSITORY}/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module

docs/dev/build-image.md

@@ -23,7 +23,7 @@ $ build-docker-images/build-images.sh -h
 
 Usage: build-docker-images/build-images.sh [OPTIONS]
 
-    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
+    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default.
     -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.4.
     -r, --revision <rev>         [Optional] Package revision. By default 1
     -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.14.0.

single-node/docker-compose.yml

@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 services:
   wazuh.manager:
-    image: merecu/wazuh-manager:4.14.0
+    image: wazuh/wazuh-manager:4.14.0
     hostname: wazuh.manager
     restart: always
     ulimits:
@@ -44,7 +44,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.indexer:
-    image: merecu/wazuh-indexer:4.14.0
+    image: wazuh/wazuh-indexer:4.14.0
     hostname: wazuh.indexer
     restart: always
     ports:
@@ -69,7 +69,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml
 
   wazuh.dashboard:
-    image: merecu/wazuh-dashboard:4.14.0
+    image: wazuh/wazuh-dashboard:4.14.0
     hostname: wazuh.dashboard
     restart: always
     ports: