Skip to content

Commit 3974663

Browse files
authored
Merge pull request #354 from andyzhangx/libssl-upgrade
fix: upgrade to debian 11.0 to fix vulnerability
2 parents 8801876 + 12f6347 commit 3974663

File tree

4 files changed

+37
-27
lines changed

4 files changed

+37
-27
lines changed

.github/workflows/trivy.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Trivy vulnerability scanner
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
jobs:
8+
build:
9+
name: Build
10+
runs-on: ubuntu-18.04
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v2
14+
15+
- name: Build an image from Dockerfile
16+
run: |
17+
export PUBLISH=true
18+
export REGISTRY=test
19+
export IMAGE_VERSION=latest
20+
export DOCKER_CLI_EXPERIMENTAL=enabled
21+
make container
22+
23+
- name: Run Trivy vulnerability scanner
24+
uses: aquasecurity/trivy-action@master
25+
with:
26+
image-ref: 'test/smb-csi:latest'
27+
format: 'table'
28+
exit-code: '1'
29+
ignore-unfixed: true
30+
vuln-type: 'os,library'
31+
severity: 'CRITICAL,HIGH'
32+

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ smb-darwin:
135135

136136
.PHONY: container
137137
container: smb
138-
docker build --no-cache -t $(IMAGE_TAG) -f ./pkg/smbplugin/dev.Dockerfile .
138+
docker build --no-cache -t $(IMAGE_TAG) --output=type=docker -f ./pkg/smbplugin/Dockerfile .
139139

140140
.PHONY: container-linux
141141
container-linux:

pkg/smbplugin/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG ARCH
15+
FROM k8s.gcr.io/build-image/debian-base:bullseye-v1.0.0
1616

17-
FROM k8s.gcr.io/build-image/debian-base:buster-v1.6.0
18-
RUN clean-install ca-certificates cifs-utils util-linux e2fsprogs mount udev xfsprogs
17+
RUN apt update && apt-mark unhold libcap2
18+
RUN clean-install ca-certificates cifs-utils util-linux e2fsprogs mount udev xfsprogs libssl1.1
1919

2020
LABEL maintainers="andyzhangx"
2121
LABEL description="SMB CSI Driver"
22-
ARG ARCH
22+
ARG ARCH=amd64
2323

2424
COPY ./_output/${ARCH}/smbplugin /smbplugin
2525
ENTRYPOINT ["/smbplugin"]

pkg/smbplugin/dev.Dockerfile

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)