From 1a3e958ee40d525beaf63a2f4a25a7b072c23995 Mon Sep 17 00:00:00 2001 From: Aviv Shavit Date: Sun, 23 May 2021 17:53:26 +0300 Subject: [PATCH 1/3] update 21130 #2 - update to release 5.3 (artifacts generated from server@98759d5) --- Dockerfile | 2 +- hardening_manifest.yaml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1964c5c..e3e6f13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} ENV BUILD_ONLY_PACKAGES="tar gzip shadow-utils" RUN microdnf install $BUILD_ONLY_PACKAGES -ARG TARBALL="aquasec-scanner-5.3.21026-ubi8.tar.gz" +ARG TARBALL="aquasec-scanner-5.3.21130-ubi8.tar.gz" RUN mkdir -p /build /opt/aquascans diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 9358b55..9dd5499 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "aqua-security/enterprise/scanner-5.3" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "5.3.21026-ubi8" + - "5.3.21130-ubi8" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi8-minimal" - BASE_TAG: "8.3" + BASE_TAG: "8.4" # Docker image labels labels: org.opencontainers.image.title: "scanner-5.3" @@ -22,7 +22,7 @@ labels: # org.opencontainers.image.url: "FIXME" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Aqua Security" - org.opencontainers.image.version: "5.3.21026-ubi8" + org.opencontainers.image.version: "5.3.21130-ubi8" ## Keywords to help with search (ex. "cicd,gitops,golang") # mil.dso.ironbank.image.keywords: "FIXME" ## This value can be "opensource" or "commercial" @@ -30,24 +30,24 @@ labels: ## Product the image belongs to for grouping multiple images # mil.dso.ironbank.product.name: "FIXME" - com.aquasec.builddate: "2021-01-26T09:44:48" - com.aquasec.commit: "3e586a1" + com.aquasec.builddate: "2021-05-10T06:38:36" + com.aquasec.commit: "3612a1c" com.aquasec.component: "scannercli" com.aquasec.release: "5.3.0" com.aquasec.version: "5.3.0" - com.aquasec.dod.commit: "ee4e544" - com.aquasec.dod.builddate: "2021-03-11T13:37+02:00" + com.aquasec.dod.commit: "98759d5" + com.aquasec.dod.builddate: "2021-05-23T17:52+03:00" com.aquasec.baseimage: "registry1.dsop.io/ironbank/redhat/ubi/ubi8-minimal:8.3" # List of resources to make available to the offline build context resources: - auth: id: aquasec-credential type: basic - filename: aquasec-scanner-5.3.21026-ubi8.tar.gz - url: https://download.aquasec.com/aquasec/csp/scanner/5.3/aquasec-scanner-5.3.21026-ubi8.tar.gz + filename: aquasec-scanner-5.3.21130-ubi8.tar.gz + url: https://download.aquasec.com/aquasec/csp/scanner/5.3/aquasec-scanner-5.3.21130-ubi8.tar.gz validation: type: sha256 - value: 6d94980668fbccf603210bf4710bba8a516ced5c72ac21252df286a53acb0f44 + value: 36b30703525e09dc209fba88efbd203a9e5a7f792b636b8a30ee40eea1565b29 # List of project maintainers # FIXME: Fill in the following details for the current container owner in the whitelist # FIXME: Include any other vendor information if applicable -- GitLab From 708d8b430f12054dd22bf217285b2f3963dc5d4d Mon Sep 17 00:00:00 2001 From: Aviv Shavit Date: Sun, 23 May 2021 18:18:02 +0300 Subject: [PATCH 2/3] update 21130 #2 - update to release 5.3 (artifacts generated from server@98759d5-dirty) --- Dockerfile | 2 +- hardening_manifest.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e3e6f13..643ac4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # Note that you will not be able to pull containers from nexus-docker-secure.levelup-dev.io into your local dev machine ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8-minimal -ARG BASE_TAG=8.3 +ARG BASE_TAG=8.4 # FROM statement must reference the base image using the three ARGs established FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 9dd5499..f98b4f4 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -35,9 +35,9 @@ labels: com.aquasec.component: "scannercli" com.aquasec.release: "5.3.0" com.aquasec.version: "5.3.0" - com.aquasec.dod.commit: "98759d5" - com.aquasec.dod.builddate: "2021-05-23T17:52+03:00" - com.aquasec.baseimage: "registry1.dsop.io/ironbank/redhat/ubi/ubi8-minimal:8.3" + com.aquasec.dod.commit: "98759d5-dirty" + com.aquasec.dod.builddate: "2021-05-23T18:16+03:00" + com.aquasec.baseimage: "registry1.dsop.io/ironbank/redhat/ubi/ubi8-minimal:8.4" # List of resources to make available to the offline build context resources: - auth: -- GitLab From fc614b558e1f9c0fa71e27d6cc46aacb01a95f77 Mon Sep 17 00:00:00 2001 From: Aviv Shavit Date: Sun, 23 May 2021 19:17:54 +0300 Subject: [PATCH 3/3] update to build 21130 and bump ubi to 8.4 - update to release 5.3 (artifacts generated from server@2dd05a9) --- hardening_manifest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index f98b4f4..ce0e1c2 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -35,8 +35,8 @@ labels: com.aquasec.component: "scannercli" com.aquasec.release: "5.3.0" com.aquasec.version: "5.3.0" - com.aquasec.dod.commit: "98759d5-dirty" - com.aquasec.dod.builddate: "2021-05-23T18:16+03:00" + com.aquasec.dod.commit: "2dd05a9" + com.aquasec.dod.builddate: "2021-05-23T19:17+03:00" com.aquasec.baseimage: "registry1.dsop.io/ironbank/redhat/ubi/ubi8-minimal:8.4" # List of resources to make available to the offline build context resources: -- GitLab