Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Wazuh cert tool image build into Wazuh images build process #1385

Merged
merged 9 commits into from
Jun 12, 2024
Merged

Add Wazuh cert tool image build into Wazuh images build process #1385

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fc1ece7
Add the build of Wazuh cert tool image to build image process
vcerenu Jun 7, 2024
1f32d2a
Modify yaml script name generator
vcerenu Jun 7, 2024
6d63bef
Modify yaml script name generator
vcerenu Jun 7, 2024
450a59a
Change the name dir to Wazuh cert tool Dockerfile
vcerenu Jun 10, 2024
aed1004
Change the generator script in multi node deployment
vcerenu Jun 10, 2024
1e6f93b
Correct the name of the certificate generator script
vcerenu Jun 11, 2024
fda4a17
Add save and load process for Wazuh Cert Tool image
vcerenu Jun 11, 2024
cf3eb61
Add save and load process for Wazuh Cert Tool image
vcerenu Jun 11, 2024
36e7160
Add save and load process for Wazuh Cert Tool image
vcerenu Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build-docker-images/build-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ build() {
echo WAZUH_UI_REVISION=$WAZUH_UI_REVISION >> .env

docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache
docker build -t wazuh/wazuh-cert-tool:$WAZUH_IMAGE_VERSION build-docker-images/cert-tool-image/

return 0
}
Expand Down
5 changes: 3 additions & 2 deletions indexer-certs-creator/Dockerfile → ...-docker-images/wazuh-cert-tool/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal
FROM amazonlinux:2023

RUN apt-get update && apt-get install openssl curl -y
RUN yum install curl-minimal openssl -y &&\
yum clean all

WORKDIR /

Expand Down
0 indexer-certs-creator/config/entrypoint.sh → ...ages/wazuh-cert-tool/config/entrypoint.sh
View file
Open in desktop
File renamed without changes.
9 changes: 0 additions & 9 deletions indexer-certs-creator/README.md
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions single-node/generate-indexer-certs.yml → multi-node/generate-certs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ version: '3'

services:
generator:
image: wazuh/wazuh-certs-generator:0.0.2
hostname: wazuh-certs-generator
image: wazuh/wazuh-cert-tool:5.0.0
hostname: wazuh-cert-tool
container_name: wazuh-cert-tool
volumes:
- ./config/wazuh_indexer_ssl_certs/:/certificates/
- ./config/certs.yml:/config/certs.yml
8 changes: 5 additions & 3 deletions multi-node/generate-indexer-certs.yml → single-node/generate-certs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ version: '3'

services:
generator:
image: wazuh/wazuh-certs-generator:0.0.2
hostname: wazuh-certs-generator
image: wazuh/wazuh-cert-tool:5.0.0
hostname: wazuh-cert-tool
container_name: wazuh-cert-tool
volumes:
- ./config/wazuh_indexer_ssl_certs/:/certificates/
- ./config/certs.yml:/config/certs.yml
- ./config/certs.yml:/config/certs.yml

Loading