yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

Standarize Artifact URL keys (#2286)

Browse Source 
* Standardize artifact URL keys for Docker builds

* Changelog update

---------

Co-authored-by: Gonzalo Acuña <teddytpc1@gmail.com>
Co-authored-by: Gonzalo Acuña <33964202+teddytpc1@users.noreply.github.com>
This commit is contained in:
Jesús García
2026-04-06 09:01:41 +02:00
committed by GitHub
co-authored by Gonzalo Acuña Gonzalo Acuña
parent 0eb0d7914f
commit 8eca20a5ae
7 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
### Changed
- Standarize Artifact URL keys ([#2286](https://github.com/wazuh/wazuh-docker/pull/2286))
- Certificates configuration script. ([#2285](https://github.com/wazuh/wazuh-docker/pull/2285))
- Modify artifact URLs file name. ([#2266](https://github.com/wazuh/wazuh-docker/pull/2266))
- Use URL signing script to generate presigned internal package URLs. ([#2259](https://github.com/wazuh/wazuh-docker/pull/2259))
build-docker-images/build-images.sh
+8 -8
View File
@@ -219,30 +219,30 @@ build() {
case "${component}" in
wazuh-indexer)
build_args+=(
--build-arg wazuh_indexer_amd64_rpm="${wazuh_indexer_amd64_rpm}"
--build-arg wazuh_indexer_arm64_rpm="${wazuh_indexer_arm64_rpm}"
--build-arg wazuh_indexer_x86_64_rpm="${wazuh_indexer_x86_64_rpm}"
--build-arg wazuh_indexer_aarch64_rpm="${wazuh_indexer_aarch64_rpm}"
--build-arg wazuh_certs_tool="${wazuh_certs_tool}"
--build-arg wazuh_config_yml="${wazuh_config_yml}"
)
;;
wazuh-manager)
build_args+=(
--build-arg wazuh_manager_amd64_rpm="${wazuh_manager_amd64_rpm}"
--build-arg wazuh_manager_arm64_rpm="${wazuh_manager_arm64_rpm}"
--build-arg wazuh_manager_x86_64_rpm="${wazuh_manager_x86_64_rpm}"
--build-arg wazuh_manager_aarch64_rpm="${wazuh_manager_aarch64_rpm}"
)
;;
wazuh-dashboard)
build_args+=(
--build-arg wazuh_dashboard_amd64_rpm="${wazuh_dashboard_amd64_rpm}"
--build-arg wazuh_dashboard_arm64_rpm="${wazuh_dashboard_arm64_rpm}"
--build-arg wazuh_dashboard_x86_64_rpm="${wazuh_dashboard_x86_64_rpm}"
--build-arg wazuh_dashboard_aarch64_rpm="${wazuh_dashboard_aarch64_rpm}"
--build-arg wazuh_certs_tool="${wazuh_certs_tool}"
--build-arg wazuh_config_yml="${wazuh_config_yml}"
)
;;
wazuh-agent)
build_args+=(
--build-arg wazuh_agent_amd64_rpm="${wazuh_agent_amd64_rpm}"
--build-arg wazuh_agent_arm64_rpm="${wazuh_agent_arm64_rpm}"
--build-arg wazuh_agent_x86_64_rpm="${wazuh_agent_x86_64_rpm}"
--build-arg wazuh_agent_aarch64_rpm="${wazuh_agent_aarch64_rpm}"
)
;;
esac
build-docker-images/build-images.yml
+8 -8
View File
@@ -5,8 +5,8 @@ services:
context: wazuh-manager/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
wazuh_manager_amd64_rpm: ${wazuh_manager_amd64_rpm}
wazuh_manager_arm64_rpm: ${wazuh_manager_arm64_rpm}
wazuh_manager_x86_64_rpm: ${wazuh_manager_x86_64_rpm}
wazuh_manager_aarch64_rpm: ${wazuh_manager_aarch64_rpm}
wazuh_certs_tool: ${wazuh_certs_tool}
wazuh_config_yml: ${wazuh_config_yml}
image: ${WAZUH_REGISTRY}/wazuh/wazuh-manager:${IMAGE_TAG}
@@ -33,8 +33,8 @@ services:
context: wazuh-agent/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
wazuh_agent_amd64_rpm: ${wazuh_agent_amd64_rpm}
wazuh_agent_arm64_rpm: ${wazuh_agent_arm64_rpm}
wazuh_agent_x86_64_rpm: ${wazuh_agent_x86_64_rpm}
wazuh_agent_aarch64_rpm: ${wazuh_agent_aarch64_rpm}
image: ${WAZUH_REGISTRY}/wazuh/wazuh-agent:${IMAGE_TAG}
hostname: wazuh.agent
restart: always
@@ -44,8 +44,8 @@ services:
context: wazuh-indexer/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
wazuh_indexer_amd64_rpm: ${wazuh_indexer_amd64_rpm}
wazuh_indexer_arm64_rpm: ${wazuh_indexer_arm64_rpm}
wazuh_indexer_x86_64_rpm: ${wazuh_indexer_x86_64_rpm}
wazuh_indexer_aarch64_rpm: ${wazuh_indexer_aarch64_rpm}
wazuh_certs_tool: ${wazuh_certs_tool}
wazuh_config_yml: ${wazuh_config_yml}
image: ${WAZUH_REGISTRY}/wazuh/wazuh-indexer:${IMAGE_TAG}
@@ -68,8 +68,8 @@ services:
context: wazuh-dashboard/
args:
WAZUH_VERSION: ${WAZUH_VERSION}
wazuh_dashboard_amd64_rpm: ${wazuh_dashboard_amd64_rpm}
wazuh_dashboard_arm64_rpm: ${wazuh_dashboard_arm64_rpm}
wazuh_dashboard_x86_64_rpm: ${wazuh_dashboard_x86_64_rpm}
wazuh_dashboard_aarch64_rpm: ${wazuh_dashboard_aarch64_rpm}
wazuh_certs_tool: ${wazuh_certs_tool}
wazuh_config_yml: ${wazuh_config_yml}
image: ${WAZUH_REGISTRY}/wazuh/wazuh-dashboard:${IMAGE_TAG}
build-docker-images/wazuh-agent/Dockerfile
+5 -3
View File
@@ -11,10 +11,12 @@ ARG WAZUH_REGISTRATION_SERVER='CHANGE_ENROLL_IP'
ARG WAZUH_REGISTRATION_PORT='CHANGE_ENROLL_PORT'
ARG WAZUH_AGENT_NAME='CHANGE_AGENT_NAME'
ARG TARGETARCH
ARG wazuh_agent_amd64_rpm
ARG wazuh_agent_arm64_rpm
ARG wazuh_agent_x86_64_rpm
ARG wazuh_agent_aarch64_rpm
RUN URL_VAR="wazuh_agent_${TARGETARCH}_rpm" && \
RUN RPM_ARCH="x86_64" && \
if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
URL_VAR="wazuh_agent_${RPM_ARCH}_rpm" && \
agent_url="${!URL_VAR}" && \
dnf install curl-minimal tar gzip procps -y &&\
curl -o /wazuh-agent.rpm "${agent_url}" && \
build-docker-images/wazuh-dashboard/Dockerfile
+5 -3
View File
@@ -4,12 +4,14 @@ FROM amazonlinux:2023 AS builder
ARG WAZUH_VERSION
ARG INSTALL_DIR=/usr/share/wazuh-dashboard
ARG TARGETARCH
ARG wazuh_dashboard_amd64_rpm
ARG wazuh_dashboard_arm64_rpm
ARG wazuh_dashboard_x86_64_rpm
ARG wazuh_dashboard_aarch64_rpm
ARG wazuh_config_yml
# Update and install dependencies
RUN URL_VAR="wazuh_dashboard_${TARGETARCH}_rpm" && \
RUN RPM_ARCH="x86_64" && \
if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
URL_VAR="wazuh_dashboard_${RPM_ARCH}_rpm" && \
dashboard_url="${!URL_VAR}" && \
dnf install curl-minimal libcap openssl -y && \
curl -o /wazuh-dashboard.rpm "${dashboard_url}" && \
build-docker-images/wazuh-indexer/Dockerfile
+5 -3
View File
@@ -3,14 +3,16 @@ FROM amazonlinux:2023 AS builder
ARG WAZUH_VERSION
ARG TARGETARCH
ARG wazuh_indexer_amd64_rpm
ARG wazuh_indexer_arm64_rpm
ARG wazuh_indexer_x86_64_rpm
ARG wazuh_indexer_aarch64_rpm
ARG wazuh_certs_tool
ARG wazuh_config_yml
COPY config/config.sh .
RUN URL_VAR="wazuh_indexer_${TARGETARCH}_rpm" && \
RUN RPM_ARCH="x86_64" && \
if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
URL_VAR="wazuh_indexer_${RPM_ARCH}_rpm" && \
indexer_url="${!URL_VAR}" && \
dnf install curl-minimal openssl xz tar findutils shadow-utils -y &&\
curl -o /wazuh-indexer.rpm "${indexer_url}" && \
build-docker-images/wazuh-manager/Dockerfile
+5 -3
View File
@@ -6,10 +6,12 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
ARG WAZUH_VERSION
ARG S6_VERSION="v2.2.0.3"
ARG TARGETARCH
ARG wazuh_manager_amd64_rpm
ARG wazuh_manager_arm64_rpm
ARG wazuh_manager_x86_64_rpm
ARG wazuh_manager_aarch64_rpm
RUN URL_VAR="wazuh_manager_${TARGETARCH}_rpm" && \
RUN RPM_ARCH="x86_64" && \
if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
URL_VAR="wazuh_manager_${RPM_ARCH}_rpm" && \
manager_url="${!URL_VAR}" && \
dnf install curl-minimal xz gnupg tar gzip openssl findutils procps -y &&\
dnf clean all && \