From 2c24e12b4e96feb04aca852f179c82402b4e8b73 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Tue, 15 Feb 2022 11:37:23 -0300
Subject: [PATCH] clean Dockerfile and docker-compose start script

---
 kibana-odfe/Dockerfile       | 2 +-
 kibana/Dockerfile            | 2 +-
 wazuh-dashboard/Dockerfile   | 2 +-
 wazuh-odfe/Dockerfile        | 2 +-
 wazuh-odfe/config/wazuh.repo | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kibana-odfe/Dockerfile b/kibana-odfe/Dockerfile
index 23f897d8..3cad99ba 100644
--- a/kibana-odfe/Dockerfile
+++ b/kibana-odfe/Dockerfile
@@ -6,7 +6,7 @@ ARG WAZUH_VERSION=4.2.5
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 
 WORKDIR /usr/share/kibana
-RUN ./bin/kibana-plugin install https://packages-dev.wazuh.com/pre-release/ui/kibana/wazuh_kibana-${WAZUH_APP_VERSION}-1.zip
+RUN ./bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-${WAZUH_APP_VERSION}-1.zip
 
 WORKDIR /
 USER root
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 76f39d0d..d98443ae 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -6,7 +6,7 @@ ARG WAZUH_VERSION=4.3.0
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 
 WORKDIR /usr/share/kibana
-RUN ./bin/kibana-plugin install https://packages-dev.wazuh.com/pre-release/ui/kibana/wazuh_kibana-${WAZUH_APP_VERSION}-1.zip
+RUN ./bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-${WAZUH_APP_VERSION}-1.zip
 
 ENV PATTERN="" \
     CHECKS_PATTERN="" \
diff --git a/wazuh-dashboard/Dockerfile b/wazuh-dashboard/Dockerfile
index 1b833ff9..3a6dedeb 100644
--- a/wazuh-dashboard/Dockerfile
+++ b/wazuh-dashboard/Dockerfile
@@ -7,7 +7,7 @@ ARG WAZUH_VERSION=4.3.0-1
 RUN apt-get update && apt install curl libcap2-bin -y
 
 #Download and install Wazuh Dashboard
-RUN curl https://s3.us-west-1.amazonaws.com/packages-dev.wazuh.com/pre-release/apt/pool/main/w/wazuh-dashboard/wazuh-dashboard_${WAZUH_VERSION}_amd64.deb --output wazuh-dashboard_${WAZUH_VERSION}_amd64.deb && \
+RUN curl https://s3.us-west-1.amazonaws.com/packages.wazuh.com/4.x/apt/pool/main/w/wazuh-dashboard/wazuh-dashboard_${WAZUH_VERSION}_amd64.deb --output wazuh-dashboard_${WAZUH_VERSION}_amd64.deb && \
     dpkg -i wazuh-dashboard_${WAZUH_VERSION}_amd64.deb && \
     apt-get clean -y && rm -rf wazuh-dashboard_${WAZUH_VERSION}_amd64.deb
 
diff --git a/wazuh-odfe/Dockerfile b/wazuh-odfe/Dockerfile
index c7a9cf83..5968d239 100644
--- a/wazuh-odfe/Dockerfile
+++ b/wazuh-odfe/Dockerfile
@@ -8,7 +8,7 @@ ARG TEMPLATE_VERSION="master"
 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
 
 # Set repositories.
-RUN rpm --import https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
+RUN rpm --import https://packages.wazuh.com/key/GPG-KEY-WAZUH
 
 COPY config/wazuh.repo /etc/yum.repos.d/wazuh.repo
 
diff --git a/wazuh-odfe/config/wazuh.repo b/wazuh-odfe/config/wazuh.repo
index 4b673ff0..e230d6a9 100644
--- a/wazuh-odfe/config/wazuh.repo
+++ b/wazuh-odfe/config/wazuh.repo
@@ -1,7 +1,7 @@
 [wazuh_repo]
 gpgcheck=1
-gpgkey=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
+gpgkey=https://packages.wazuh.com/key/GPG-KEY-WAZUH
 enabled=1
 name=Wazuh repository
-baseurl=https://packages-dev.wazuh.com/pre-release/yum/
+baseurl=https://packages.wazuh.com/4.x/yum/
 protect=1