From 5b2afd1acbcb9720d0f2d023ae4afc4be29cfca0 Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Fri, 2 Jan 2026 08:33:56 -0500 Subject: [PATCH 1/2] Adapt Wazuh agent Dockerfile s6 overlay for multi-architecture support --- build-docker-images/wazuh-agent/Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build-docker-images/wazuh-agent/Dockerfile b/build-docker-images/wazuh-agent/Dockerfile index 242ca8a3..8b5278d2 100644 --- a/build-docker-images/wazuh-agent/Dockerfile +++ b/build-docker-images/wazuh-agent/Dockerfile @@ -12,6 +12,7 @@ ARG WAZUH_REGISTRATION_SERVER='CHANGE_ENROLL_IP' ARG WAZUH_REGISTRATION_PORT='CHANGE_ENROLL_PORT' ARG WAZUH_AGENT_NAME='CHANGE_AGENT_NAME' ARG WAZUH_AGENT_GROUPS='CHANGE_AGENT_GROUPS' +ARG TARGETARCH COPY config/check_repository.sh / @@ -24,11 +25,13 @@ RUN source /check_repository.sh RUN yum install wazuh-agent-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \ yum clean all && \ sed -i '//d' /var/ossec/etc/ossec.conf && \ - curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz \ - -o /tmp/s6-overlay-amd64.tar.gz && \ - tar xzf /tmp/s6-overlay-amd64.tar.gz -C / --exclude="./bin" && \ - tar xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin && \ - rm /tmp/s6-overlay-amd64.tar.gz + S6_ARCH="amd64" && \ + if [ "${TARGETARCH}" = "arm64" ]; then S6_ARCH="aarch64"; fi && \ + curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-${S6_ARCH}.tar.gz \ + -o /tmp/s6-overlay-${S6_ARCH}.tar.gz && \ + tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / --exclude="./bin" && \ + tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C /usr ./bin && \ + rm /tmp/s6-overlay-${S6_ARCH}.tar.gz COPY config/etc/ /etc/ From 7623439395428152b9336e87e8ff19fcdaaebba6 Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Mon, 5 Jan 2026 08:49:32 -0500 Subject: [PATCH 2/2] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d81feffa..b45fb2fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed +- Adapt Wazuh Agent Dockerfile for multi-architecture support ([#2149](https://github.com/wazuh/wazuh-docker/pull/2149)) - Agent group parameter added ([#2127](https://github.com/wazuh/wazuh-docker/pull/2127)) - Adapt to multi architecture build ([#2120](https://github.com/wazuh/wazuh-docker/pull/2120))