This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new a0964ecba4 Fix trivy CI issue (#11757)
a0964ecba4 is described below
commit a0964ecba465b47a910ddfda84d0812faec22d7a
Author: Xiang Fu <[email protected]>
AuthorDate: Sun Oct 8 21:15:59 2023 -0700
Fix trivy CI issue (#11757)
---
.github/workflows/pinot_vuln_check.yml | 7 ++---
.github/workflows/scripts/.pinot_vuln_check.sh | 41 ++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/pinot_vuln_check.yml
b/.github/workflows/pinot_vuln_check.yml
index d9aea49353..c0e798b2b4 100644
--- a/.github/workflows/pinot_vuln_check.yml
+++ b/.github/workflows/pinot_vuln_check.yml
@@ -39,18 +39,15 @@ jobs:
steps:
- uses: docker/setup-qemu-action@v2
name: Set up QEMU
- - uses: docker/setup-buildx-action@v2
- name: Set up Docker Buildx
- uses: actions/checkout@v3
- name: Build the Docker image
env:
DOCKER_FILE_BASE_DIR: "docker/images/pinot"
DOCKER_IMAGE_NAME: "apachepinot/pinot"
- BUILD_PLATFORM: "linux/amd64"
PINOT_GIT_URL: ${{ github.event.inputs.gitUrl }}
PINOT_BRANCH: ${{ env.GITHUB_REF }}
- TAGS: ${{ github.sha }}
- run: .github/workflows/scripts/docker/.pinot_docker_image_build.sh
+ PINOT_SHA: ${{ github.sha }}
+ run: .github/workflows/scripts/.pinot_vuln_check.sh
- name: Run Trivy vulnerability scanner (sarif)
uses: aquasecurity/trivy-action@master
diff --git a/.github/workflows/scripts/.pinot_vuln_check.sh
b/.github/workflows/scripts/.pinot_vuln_check.sh
new file mode 100755
index 0000000000..c65f379b06
--- /dev/null
+++ b/.github/workflows/scripts/.pinot_vuln_check.sh
@@ -0,0 +1,41 @@
+#!/bin/bash -x
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, 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.
+#
+
+if [ -z "${DOCKER_IMAGE_NAME}" ]; then
+ DOCKER_IMAGE_NAME="apachepinot/pinot"
+fi
+if [ -z "${PINOT_GIT_URL}" ]; then
+ PINOT_GIT_URL="https://github.com/apache/pinot.git";
+fi
+if [ -z "${PINOT_BRANCH}" ]; then
+ PINOT_BRANCH="master"
+fi
+
+cd ${DOCKER_FILE_BASE_DIR}
+
+docker build \
+ --no-cache \
+ --file Dockerfile \
+ --build-arg PINOT_GIT_URL=${PINOT_GIT_URL} \
+ --build-arg PINOT_BRANCH=${PINOT_BRANCH} \
+ --tag ${DOCKER_IMAGE_NAME}:${PINOT_SHA} \
+ .
+
+docker image ls
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
