feat(grype-server): bump grype server version to v0.5.0 (#594)

openclarity · Aug 25, 2023 · c1a17de · c1a17de
1 parent 5d1cd61
commit c1a17de
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 52 deletions.
diff --git a/installation/aws/VmClarity.cfn b/installation/aws/VmClarity.cfn
@@ -358,11 +358,10 @@ Resources:
                           - warning
                         ports:
                           - "9991:9991"
-                        env_file: ./grype-server.env
                         volumes:
                           - type: bind
                             source: /opt/grype-server
-                            target: /opt/grype-server
+                            target: /data
                         logging:
                           driver: journald
                         deploy:
@@ -418,7 +417,7 @@ Resources:
                     UIBackendContainerImage: !If [ UIBackendContainerImageOverridden, !Ref UIBackendContainerImageOverride, "ghcr.io/openclarity/vmclarity-ui-backend:latest" ]
                     ExploitDBServerContainerImage: !If [ExploitDBServerContainerImageOverridden, !Ref ExploitDBServerContainerImageOverride, "ghcr.io/openclarity/exploit-db-server:v0.2.3"]
                     TrivyServerContainerImage: !If [TrivyServerContainerImageOverridden, !Ref TrivyServerContainerImageOverride, "docker.io/aquasec/trivy:0.41.0"]
-                    GrypeServerContainerImage: !If [GrypeServerContainerImageOverridden, !Ref GrypeServerContainerImageOverride, "ghcr.io/openclarity/grype-server:v0.4.0"]
+                    GrypeServerContainerImage: !If [GrypeServerContainerImageOverridden, !Ref GrypeServerContainerImageOverride, "ghcr.io/openclarity/grype-server:v0.5.0"]
                     FreshclamMirrorContainerImage: !If [FreshclamMirrorContainerImageOverridden, !Ref FreshclamMirrorContainerImageOverride, "ghcr.io/openclarity/freshclam-mirror:v0.2.0"]
                     PostgresqlContainerImage: !If [PostgresqlContainerImageOverridden, !Ref PostgresqlContainerImageOverride, "bitnami/postgresql:12.14.0-debian-11-r28"]
 
@@ -504,11 +503,6 @@ Resources:
                 TRIVY_CACHE_DIR=/home/scanner/.cache/trivy
               mode: "000644"
 
-            "/etc/vmclarity/grype-server.env":
-              content: |
-                DB_ROOT_DIR=/opt/grype-server/db
-              mode: "000644"
-
             "/etc/vmclarity/service.env":
               content: |
                 # COMPOSE_PROFILES=
@@ -1068,7 +1062,7 @@ Parameters:
   GrypeServerContainerImageOverride:
     Description: >
       Name of the container image used for the grype server.
-      "ghcr.io/openclarity/grype-server:v0.2.0" will be used if not overridden.
+      "ghcr.io/openclarity/grype-server:v0.5.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
@@ -220,7 +220,7 @@
                             "type": "Microsoft.Common.TextBox",
                             "label": "Grype Server Container Image",
                             "subLabel": "",
-                            "defaultValue": "ghcr.io/openclarity/grype-server:v0.2.0",
+                            "defaultValue": "ghcr.io/openclarity/grype-server:v0.5.0",
                             "toolTip": "Grype Server Container Image",
                             "constraints": {
                                 "required": false,

diff --git a/installation/azure/vmclarity-install.sh b/installation/azure/vmclarity-install.sh
@@ -237,11 +237,10 @@ services:
       - warning
     ports:
       - "9991:9991"
-    env_file: ./grype-server.env
     volumes:
       - type: bind
         source: /opt/grype-server
-        target: /opt/grype-server
+        target: /data
     logging:
       driver: journald
     deploy:
@@ -326,11 +325,6 @@ TRIVY_CACHE_DIR=/home/scanner/.cache/trivy
 EOF
 chmod 644 /etc/vmclarity/trivy-server.env
 
-cat << 'EOF' > /etc/vmclarity/grype-server.env
-DB_ROOT_DIR=/opt/grype-server/db
-EOF
-chmod 644 /etc/vmclarity/grype-server.env
-
 cat << 'EOF' > /etc/vmclarity/postgres.env
 POSTGRESQL_USERNAME=vmclarity
 POSTGRESQL_PASSWORD=__PostgresDBPassword__

diff --git a/installation/azure/vmclarity.bicep b/installation/azure/vmclarity.bicep
@@ -42,7 +42,7 @@ param scannerContainerImage string = 'ghcr.io/openclarity/vmclarity-cli:latest'
 param trivyServerContainerImage string = 'docker.io/aquasec/trivy:0.41.0'
 
 @description ('Grype Server Container Image')
-param grypeServerContainerImage string = 'ghcr.io/openclarity/grype-server:v0.2.0'
+param grypeServerContainerImage string = 'ghcr.io/openclarity/grype-server:v0.5.0'
 
 @description ('Exploit DB Container Image')
 param exploitDBContainerImage string = 'ghcr.io/openclarity/exploit-db-server:v0.2.3'

diff --git a/installation/azure/vmclarity.json b/installation/azure/vmclarity.json
diff --git a/installation/azure/vmclarityDeployModule.bicep b/installation/azure/vmclarityDeployModule.bicep
@@ -49,7 +49,7 @@ param scannerContainerImage string = 'ghcr.io/openclarity/vmclarity-cli:latest'
 param trivyServerContainerImage string = 'docker.io/aquasec/trivy:0.41.0'
 
 @description ('Grype Server Container Image')
-param grypeServerContainerImage string = 'ghcr.io/openclarity/grype-server:v0.2.0'
+param grypeServerContainerImage string = 'ghcr.io/openclarity/grype-server:v0.5.0'
 
 @description ('Exploit DB Container Image')
 param exploitDBContainerImage string = 'ghcr.io/openclarity/exploit-db-server:v0.2.3'

diff --git a/installation/docker/dockercompose.yml b/installation/docker/dockercompose.yml
@@ -102,30 +102,14 @@ services:
       restart_policy:
         condition: on-failure
 
-  grype-server-init:
-    image: ${GrypeServerContainerImage:-ghcr.io/openclarity/grype-server:v0.4.0}
-    user: root
-    entrypoint: /bin/sh
-    command:
-      - -c
-      - chown -R 1000:1000 /data
-    volumes:
-      - type: volume
-        source: grype-server-db
-        target: /data
-
   grype-server:
-    image: ${GrypeServerContainerImage:-ghcr.io/openclarity/grype-server:v0.4.0}
-    depends_on:
-      grype-server-init:
-        condition: service_completed_successfully
+    image: ${GrypeServerContainerImage:-ghcr.io/openclarity/grype-server:v0.5.0}
     command:
       - run
       - --log-level
       - warning
     ports:
       - "9991:9991"
-    env_file: ./grype-server.env
     deploy:
       mode: replicated
       replicas: 1
@@ -137,7 +121,7 @@ services:
         target: /data
 
   freshclam-mirror:
-    image: ${FreshclamMirrorContainerImage:-ghcr.io/openclarity/freshclam-mirror:v0.1.0}
+    image: ${FreshclamMirrorContainerImage:-ghcr.io/openclarity/freshclam-mirror:v0.2.0}
     ports:
       - "1000:80"
     deploy:

diff --git a/installation/docker/grype-server.env b/installation/docker/grype-server.env
diff --git a/installation/gcp/dm/components/vmclarity-install.sh b/installation/gcp/dm/components/vmclarity-install.sh
@@ -230,11 +230,10 @@ services:
       - warning
     ports:
       - "9991:9991"
-    env_file: ./grype-server.env
     volumes:
       - type: bind
         source: /opt/grype-server
-        target: /opt/grype-server
+        target: /data
     logging:
       driver: journald
     deploy:
@@ -319,11 +318,6 @@ TRIVY_CACHE_DIR=/home/scanner/.cache/trivy
 EOF
 chmod 644 /etc/vmclarity/trivy-server.env
 
-cat << 'EOF' > /etc/vmclarity/grype-server.env
-DB_ROOT_DIR=/opt/grype-server/db
-EOF
-chmod 644 /etc/vmclarity/grype-server.env
-
 cat << 'EOF' > /etc/vmclarity/postgres.env
 POSTGRESQL_USERNAME=vmclarity
 POSTGRESQL_PASSWORD={PostgresDBPassword}

diff --git a/installation/gcp/dm/components/vmclarity-server.py.schema b/installation/gcp/dm/components/vmclarity-server.py.schema
@@ -81,7 +81,7 @@ properties:
     description: The container image to use for the trivy server
   grypeServerContainerImage:
     type: string
-    default: ghcr.io/openclarity/grype-server:v0.2.0
+    default: ghcr.io/openclarity/grype-server:v0.5.0
     description: The container image to use for the grype server
   freshclamMirrorContainerImage:
     type: string

diff --git a/installation/gcp/dm/vmclarity.py.schema b/installation/gcp/dm/vmclarity.py.schema
@@ -73,7 +73,7 @@ properties:
     description: The container image to use for the trivy server
   grypeServerContainerImage:
     type: string
-    default: ghcr.io/openclarity/grype-server:v0.2.0
+    default: ghcr.io/openclarity/grype-server:v0.5.0
     description: The container image to use for the grype server
   freshclamMirrorContainerImage:
     type: string