From 6a4dc3c3eb01d9c530dcceb46eebc1cce3e18d4d Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 18 Aug 2023 15:11:21 -0300 Subject: [PATCH 1/4] change repository checkout --- .../workflows/{trivy-dashboard-4-4.yml => trivy-dashboard.yml} | 3 ++- .github/workflows/{trivy-indexer-4-4.yml => trivy-indexer.yml} | 3 ++- .github/workflows/{trivy-manager-4-4.yml => trivy-manager.yml} | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) rename .github/workflows/{trivy-dashboard-4-4.yml => trivy-dashboard.yml} (94%) rename .github/workflows/{trivy-indexer-4-4.yml => trivy-indexer.yml} (94%) rename .github/workflows/{trivy-manager-4-4.yml => trivy-manager.yml} (94%) diff --git a/.github/workflows/trivy-dashboard-4-4.yml b/.github/workflows/trivy-dashboard.yml similarity index 94% rename from .github/workflows/trivy-dashboard-4-4.yml rename to .github/workflows/trivy-dashboard.yml index 863f4b03..a9c04a23 100644 --- a/.github/workflows/trivy-dashboard-4-4.yml +++ b/.github/workflows/trivy-dashboard.yml @@ -31,12 +31,13 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - with: { ref: v4.4.5 } - name: Installing dependencies run: | sudo apt-get update sudo apt-get install -y jq + latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') + git checkout $latest - name: Build Wazuh images run: build-docker-images/build-images.sh diff --git a/.github/workflows/trivy-indexer-4-4.yml b/.github/workflows/trivy-indexer.yml similarity index 94% rename from .github/workflows/trivy-indexer-4-4.yml rename to .github/workflows/trivy-indexer.yml index 9baec82c..2a5b182a 100644 --- a/.github/workflows/trivy-indexer-4-4.yml +++ b/.github/workflows/trivy-indexer.yml @@ -31,12 +31,13 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - with: { ref: v4.4.5 } - name: Installing dependencies run: | sudo apt-get update sudo apt-get install -y jq + latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') + git checkout $latest - name: Build Wazuh images run: build-docker-images/build-images.sh diff --git a/.github/workflows/trivy-manager-4-4.yml b/.github/workflows/trivy-manager.yml similarity index 94% rename from .github/workflows/trivy-manager-4-4.yml rename to .github/workflows/trivy-manager.yml index d8631089..8b1dc659 100644 --- a/.github/workflows/trivy-manager-4-4.yml +++ b/.github/workflows/trivy-manager.yml @@ -31,12 +31,13 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - with: { ref: v4.4.5 } - name: Installing dependencies run: | sudo apt-get update sudo apt-get install -y jq + latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') + git checkout $latest - name: Build Wazuh images run: build-docker-images/build-images.sh From bd513e80cc524132c22e57643e5c07ccbdeecfa2 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 18 Aug 2023 15:18:56 -0300 Subject: [PATCH 2/4] add new step --- .github/workflows/trivy-dashboard.yml | 3 +++ .github/workflows/trivy-indexer.yml | 3 +++ .github/workflows/trivy-manager.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/.github/workflows/trivy-dashboard.yml b/.github/workflows/trivy-dashboard.yml index a9c04a23..8ee00521 100644 --- a/.github/workflows/trivy-dashboard.yml +++ b/.github/workflows/trivy-dashboard.yml @@ -36,8 +36,11 @@ jobs: run: | sudo apt-get update sudo apt-get install -y jq + + - name: Checkout latest tag latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') git checkout $latest + - name: Build Wazuh images run: build-docker-images/build-images.sh diff --git a/.github/workflows/trivy-indexer.yml b/.github/workflows/trivy-indexer.yml index 2a5b182a..71d272e0 100644 --- a/.github/workflows/trivy-indexer.yml +++ b/.github/workflows/trivy-indexer.yml @@ -36,8 +36,11 @@ jobs: run: | sudo apt-get update sudo apt-get install -y jq + + - name: Checkout latest tag latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') git checkout $latest + - name: Build Wazuh images run: build-docker-images/build-images.sh diff --git a/.github/workflows/trivy-manager.yml b/.github/workflows/trivy-manager.yml index 8b1dc659..e5787f80 100644 --- a/.github/workflows/trivy-manager.yml +++ b/.github/workflows/trivy-manager.yml @@ -36,8 +36,11 @@ jobs: run: | sudo apt-get update sudo apt-get install -y jq + + - name: Checkout latest tag latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') git checkout $latest + - name: Build Wazuh images run: build-docker-images/build-images.sh From a2f50192b6c560b414a3acd326a06230b2d5fd06 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 18 Aug 2023 15:21:07 -0300 Subject: [PATCH 3/4] add new step --- .github/workflows/trivy-dashboard.yml | 1 + .github/workflows/trivy-indexer.yml | 1 + .github/workflows/trivy-manager.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/trivy-dashboard.yml b/.github/workflows/trivy-dashboard.yml index 8ee00521..5f247878 100644 --- a/.github/workflows/trivy-dashboard.yml +++ b/.github/workflows/trivy-dashboard.yml @@ -38,6 +38,7 @@ jobs: sudo apt-get install -y jq - name: Checkout latest tag + run: | latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') git checkout $latest diff --git a/.github/workflows/trivy-indexer.yml b/.github/workflows/trivy-indexer.yml index 71d272e0..aacb42b9 100644 --- a/.github/workflows/trivy-indexer.yml +++ b/.github/workflows/trivy-indexer.yml @@ -38,6 +38,7 @@ jobs: sudo apt-get install -y jq - name: Checkout latest tag + run: | latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') git checkout $latest diff --git a/.github/workflows/trivy-manager.yml b/.github/workflows/trivy-manager.yml index e5787f80..89db7dc7 100644 --- a/.github/workflows/trivy-manager.yml +++ b/.github/workflows/trivy-manager.yml @@ -38,6 +38,7 @@ jobs: sudo apt-get install -y jq - name: Checkout latest tag + run: | latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') git checkout $latest From 1d8332725f2f5ce90140e2002219b44664a9a49d Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 18 Aug 2023 15:23:12 -0300 Subject: [PATCH 4/4] add fetch --- .github/workflows/trivy-dashboard.yml | 1 + .github/workflows/trivy-indexer.yml | 1 + .github/workflows/trivy-manager.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/trivy-dashboard.yml b/.github/workflows/trivy-dashboard.yml index 5f247878..8bc2decf 100644 --- a/.github/workflows/trivy-dashboard.yml +++ b/.github/workflows/trivy-dashboard.yml @@ -40,6 +40,7 @@ jobs: - name: Checkout latest tag run: | latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') + git fetch origin git checkout $latest - name: Build Wazuh images diff --git a/.github/workflows/trivy-indexer.yml b/.github/workflows/trivy-indexer.yml index aacb42b9..3582e21d 100644 --- a/.github/workflows/trivy-indexer.yml +++ b/.github/workflows/trivy-indexer.yml @@ -40,6 +40,7 @@ jobs: - name: Checkout latest tag run: | latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') + git fetch origin git checkout $latest - name: Build Wazuh images diff --git a/.github/workflows/trivy-manager.yml b/.github/workflows/trivy-manager.yml index 89db7dc7..18bdf1b8 100644 --- a/.github/workflows/trivy-manager.yml +++ b/.github/workflows/trivy-manager.yml @@ -40,6 +40,7 @@ jobs: - name: Checkout latest tag run: | latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name') + git fetch origin git checkout $latest - name: Build Wazuh images