update trivy config and version (#365)

astronomer · Jul 19, 2022 · 96a618f · 96a618f
1 parent d6dbcc5
commit 96a618f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/bin/trivy-scan.sh b/bin/trivy-scan.sh
@@ -11,6 +11,7 @@ set +exo pipefail
 trivy \
   --cache-dir /tmp/workspace/trivy-cache \
   image \
+  --config "${GIT_ROOT}/${scan_target}/trivy.yaml" \
   --ignorefile "${GIT_ROOT}/ap-${scan_target}/trivyignore" \
   --ignorefile "${GIT_ROOT}/${scan_target}/trivyignore" \
   --ignore-unfixed -s HIGH,CRITICAL \

diff --git a/po-spilo/Dockerfile b/po-spilo/Dockerfile
@@ -12,6 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+# https://registry.opensource.zalan.do/v2/acid/spilo-14/tags/list
 FROM registry.opensource.zalan.do/acid/spilo-14:2.1-p5
 LABEL maintainer="Astronomer <[email protected]>"
 

diff --git a/po-spilo/trivy.yaml b/po-spilo/trivy.yaml
@@ -0,0 +1,3 @@
+scan:
+  skip-dirs:
+    - /etc/ssl/private
diff --git a/po-spilo/version.txt b/po-spilo/version.txt
@@ -1 +1 @@
-2.1
+14.2.1-p5