fix: yara tools (#1345)

Yara version installed in yara-tools-server and vmclarity-cli images must be the same to avoid compatibilkity issues.
openclarity · Feb 22, 2024 · 22524ab · 22524ab
1 parent 16b98e2
commit 22524ab
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/Dockerfile.cli b/Dockerfile.cli
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1@sha256:ac85f380a63b13dfcefa89046420e1781752bab202122f8f50032edf31be0021
 
-ARG VMCLARITY_TOOLS_BASE=ghcr.io/openclarity/vmclarity-tools-base:v0.5.1@sha256:43a1d8d9fed33e0561edb8d422a1b2645633e0ec9055519aac070186fb1ce770
+ARG VMCLARITY_TOOLS_BASE=ghcr.io/openclarity/vmclarity-tools-base:v0.6.0@sha256:dc9779be25bdbd3a8725e768764a223b8ba5fd906fc5afc67b417886086806d8
 # xx is a helper for cross-compilation
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0@sha256:0cd3f05c72d6c9b038eb135f91376ee1169ef3a330d34e418e65e2a5c2e9c0d4 AS xx
 

diff --git a/installation/aws/VmClarity.cfn b/installation/aws/VmClarity.cfn
@@ -445,7 +445,7 @@ Resources:
                     ExploitDBServerContainerImage: !If [ExploitDBServerContainerImageOverridden, !Ref ExploitDBServerContainerImageOverride, "ghcr.io/openclarity/exploit-db-server:v0.2.4"]
                     TrivyServerContainerImage: !If [TrivyServerContainerImageOverridden, !Ref TrivyServerContainerImageOverride, "docker.io/aquasec/trivy:0.41.0"]
                     GrypeServerContainerImage: !If [GrypeServerContainerImageOverridden, !Ref GrypeServerContainerImageOverride, "ghcr.io/openclarity/grype-server:v0.7.2"]
-                    YaraRuleServerContainerImage: !If [YaraRuleServerContainerImageOverridden, !Ref YaraRuleServerContainerImageOverride, "ghcr.io/openclarity/yara-rule-server:v0.1.0"]
+                    YaraRuleServerContainerImage: !If [YaraRuleServerContainerImageOverridden, !Ref YaraRuleServerContainerImageOverride, "ghcr.io/openclarity/yara-rule-server:v0.3.0"]
                     FreshclamMirrorContainerImage: !If [FreshclamMirrorContainerImageOverridden, !Ref FreshclamMirrorContainerImageOverride, "ghcr.io/openclarity/freshclam-mirror:v0.3.0"]
                     PostgresqlContainerImage: !If [PostgresqlContainerImageOverridden, !Ref PostgresqlContainerImageOverride, "bitnami/postgresql:12.14.0-debian-11-r28"]
 
@@ -1133,7 +1133,7 @@ Parameters:
   YaraRuleServerContainerImageOverride:
     Description: >
       Name of the container image used for the yara rule server.
-      "ghcr.io/openclarity/yara-rule-server:v0.1.0" will be used if not overridden.
+      "ghcr.io/openclarity/yara-rule-server:v0.3.0" will be used if not overridden.
     Type: String
     Default: ''
   ExploitDBServerContainerImageOverride:

diff --git a/installation/azure/vmclarity-UI.json b/installation/azure/vmclarity-UI.json
@@ -316,7 +316,7 @@
                             "type": "Microsoft.Common.TextBox",
                             "label": "Yara Rule Server Container Image",
                             "subLabel": "",
-                            "defaultValue": "ghcr.io/openclarity/yara-rule-server:v0.1.0",
+                            "defaultValue": "ghcr.io/openclarity/yara-rule-server:v0.3.0",
                             "toolTip": "Yara Rule Server Container Image",
                             "constraints": {
                                 "required": false,

diff --git a/installation/azure/vmclarity.json b/installation/azure/vmclarity.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.25.53.49325",
-      "templateHash": "18087006676817818247"
+      "templateHash": "15765059140427146956"
     }
   },
   "parameters": {
@@ -556,7 +556,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.25.53.49325",
-              "templateHash": "13649397790537468138"
+              "templateHash": "4572725164467035150"
             }
           },
           "parameters": {
@@ -688,7 +688,7 @@
             },
             "yaraRuleServerContainerImage": {
               "type": "string",
-              "defaultValue": "ghcr.io/openclarity/yara-rule-server:v0.1.0",
+              "defaultValue": "ghcr.io/openclarity/yara-rule-server:v0.3.0",
               "metadata": {
                 "description": "Yara Rule Server Container Image"
               }

diff --git a/installation/azure/vmclarityDeployModule.bicep b/installation/azure/vmclarityDeployModule.bicep
@@ -58,7 +58,7 @@ param exploitDBContainerImage string = 'ghcr.io/openclarity/exploit-db-server:v0
 param freshclamMirrorContainerImage string = 'ghcr.io/openclarity/freshclam-mirror:v0.3.0'
 
 @description ('Yara Rule Server Container Image')
-param yaraRuleServerContainerImage string = 'ghcr.io/openclarity/yara-rule-server:v0.1.0'
+param yaraRuleServerContainerImage string = 'ghcr.io/openclarity/yara-rule-server:v0.3.0'
 
 @description('Postgres Container Image')
 param postgresContainerImage string = 'docker.io/bitnami/postgresql:12.14.0-debian-11-r28'

diff --git a/installation/docker/docker-compose.yml b/installation/docker/docker-compose.yml
@@ -152,7 +152,7 @@ services:
         condition: on-failure
 
   yara-rule-server:
-    image: ${VMCLARITY_YARA_RULE_SERVER_CONTAINER_IMAGE:-ghcr.io/openclarity/yara-rule-server:v0.1.0}
+    image: ${VMCLARITY_YARA_RULE_SERVER_CONTAINER_IMAGE:-ghcr.io/openclarity/yara-rule-server:v0.3.0}
     command:
       - run
     ports:

diff --git a/installation/docker/image_override.env b/installation/docker/image_override.env
@@ -9,5 +9,5 @@ VMCLARITY_EXPLOITSDB_SERVER_CONTAINER_IMAGE=ghcr.io/openclarity/exploit-db-serve
 VMCLARITY_TRIVY_SERVER_CONTAINER_IMAGE=docker.io/aquasec/trivy:0.41.0
 VMCLARITY_GRYPE_SERVER_CONTAINER_IMAGE=ghcr.io/openclarity/grype-server:v0.7.2
 VMCLARITY_FRESHCLAM_MIRROR_CONTAINER_IMAGE=ghcr.io/openclarity/freshclam-mirror:v0.3.0
-VMCLARITY_YARA_RULE_SERVER_CONTAINER_IMAGE=ghcr.io/openclarity/yara-rule-server:v0.1.0
+VMCLARITY_YARA_RULE_SERVER_CONTAINER_IMAGE=ghcr.io/openclarity/yara-rule-server:v0.3.0
 VMCLARITY_POSTGRESQL_CONTAINER_IMAGE=docker.io/bitnami/postgresql:16.2.0-debian-11-r17
diff --git a/installation/gcp/dm/components/vmclarity-server.py.schema b/installation/gcp/dm/components/vmclarity-server.py.schema
@@ -89,7 +89,7 @@ properties:
     description: The container image to use for the fresh clam mirror server
   yaraRuleServerContainerImage:
     type: string
-    default: ghcr.io/openclarity/yara-rule-server:v0.1.0
+    default: ghcr.io/openclarity/yara-rule-server:v0.3.0
     description: The container image to use for the yara rule server
   postgresqlContainerImage:
     type: string

diff --git a/installation/kubernetes/helm/vmclarity/README.md b/installation/kubernetes/helm/vmclarity/README.md
@@ -346,7 +346,7 @@ secrets.
 | yaraRuleServer.image.pullPolicy | string | `"IfNotPresent"` | Yara Rule Server image pull policy |
 | yaraRuleServer.image.registry | string | `"ghcr.io"` | Yara Rule Server container registry |
 | yaraRuleServer.image.repository | string | `"openclarity/yara-rule-server"` | Yara Rule Server container repository |
-| yaraRuleServer.image.tag | string | `"v0.1.0"` | Yara Rule Server container tag |
+| yaraRuleServer.image.tag | string | `"v0.3.0"` | Yara Rule Server container tag |
 | yaraRuleServer.podSecurityContext.enabled | bool | `false` | Pod security context enabled |
 | yaraRuleServer.podSecurityContext.fsGroup | int | `1001` | Pod security context fsGroup |
 | yaraRuleServer.replicas | int | `1` | Number of replicas for the Yara Rule Server service |

diff --git a/installation/kubernetes/helm/vmclarity/values.yaml b/installation/kubernetes/helm/vmclarity/values.yaml
@@ -792,7 +792,7 @@ yaraRuleServer:
     # -- Yara Rule Server container repository
     repository: openclarity/yara-rule-server
     # -- Yara Rule Server container tag
-    tag: v0.1.0
+    tag: v0.3.0
     # -- Yara Rule Server image digest. If set will override the tag.
     digest: ""
     # -- Yara Rule Server image pull policy