fix docker hub push for matrix

.github/workflows/docker-hub-image.yml

@@ -25,6 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        repositories: ["kennyopennix/wazuh-agent", "kennyopennix/wazuh-agent-amazonlinux", "kennyopennix/wazuh-agent-ubuntu"]
         include:
           - dockerfile: ./Dockerfile
             image: kennyopennix/wazuh-agent
@@ -61,31 +62,15 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          sername: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           file: ${{ matrix.dockerfile }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Update repo description Wazuh agent minideb description
-        uses: peter-evans/dockerhub-description@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-          repository: kennyopennix/wazuh-agent
-
-      - name: Update repo description Wazuh agent amazonlinux description
-        uses: peter-evans/dockerhub-description@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-          repository: kennyopennix/wazuh-agent-amazonlinux
-      - name: Update repo description Wazuh agent ubuntu  description
+      - name: Update repo description
         uses: peter-evans/dockerhub-description@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-          repository: kennyopennix/wazuh-agent-amazonlinux
+          repository: ${{ matrix.repositories }}

.github/workflows/tests-wazuh-docker.yml

@@ -29,6 +29,7 @@ jobs:
       uses: actions/setup-python@v3
       with:
         python-version: "3.8"
+        cache: 'pip'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
@@ -37,7 +37,7 @@ repos:
     - id: shellcheck
     - id: shfmt
 - repo: https://github.com/jorisroovers/gitlint
-  rev: 'v0.19.0dev'
+  rev: 'v0.19.1'
   hooks:
   - id: gitlint
 - repo: local
@@ -49,6 +49,6 @@ repos:
     entry: flake8
     types: [python]
 - repo: https://github.com/Lucas-C/pre-commit-hooks-safety
-  rev: 'v1.3.1'
+  rev: 'v1.3.2'
   hooks:
   - id: python-safety-dependencies-check

README.md

@@ -55,7 +55,7 @@ docker run --rm kennyopennix/wazuh-agent:latest
 ## Run docker-compose
 
 ```shell
-docker compose up -d 
+docker compose up -d
 ```
 
 Will run Wazuh cluster in single node mode and 3 agents
@@ -117,4 +117,3 @@ docker build . -t wazuh-agent:latest
 ## Support project
 
 <a href="https://www.buymeacoffee.com/pyToshka" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>
-

requirements-dev.txt

@@ -8,4 +8,3 @@ markupsafe==2.1.1
 pytest==7.4.4
 pytest-testinfra==8.1.0
 black==23.12.1
-

tests/amazonlinux/conftest.py

@@ -6,7 +6,7 @@
 
 root_dir = os.path.abspath(os.curdir)
 base_image = os.getenv("IMAGE_NAME", "wazuh-agent-amazonlinux:testinfra")
-docker_file = os.getenv("DOCKERFILE", f"images/Dockerfie.amazonlinux")
+docker_file = os.getenv("DOCKERFILE", "images/Dockerfie.amazonlinux")
 
 
 @pytest.fixture(scope="session")

tests/minideb/conftest.py

@@ -6,7 +6,7 @@
 
 root_dir = os.path.abspath(os.curdir)
 base_image = os.getenv("IMAGE_NAME", "wazuh-agent-minideb:testinfra")
-docker_file = os.getenv("DOCKERFILE", f"Dockerfile")
+docker_file = os.getenv("DOCKERFILE", "Dockerfile")
 
 
 @pytest.fixture(scope="session")

tests/single-node/config/wazuh_indexer/wazuh.indexer.yml

@@ -27,4 +27,4 @@ plugins.security.restapi.roles_enabled:
 plugins.security.system_indices.enabled: true
 plugins.security.system_indices.indices: [".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opendistro-notifications-*", ".opendistro-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"]
 plugins.security.allow_default_init_securityindex: true
-cluster.routing.allocation.disk.threshold_enabled: false
+cluster.routing.allocation.disk.threshold_enabled: false

tests/ubuntu/conftest.py

@@ -6,7 +6,7 @@
 
 root_dir = os.path.abspath(os.curdir)
 base_image = os.getenv("IMAGE_NAME", "wazuh-agent-ubuntu:testinfra")
-docker_file = os.getenv("DOCKERFILE", f"images/Dockerfie.ubuntu")
+docker_file = os.getenv("DOCKERFILE", "images/Dockerfie.ubuntu")
 
 
 @pytest.fixture(scope="session")