Skip to content

Commit

Permalink
fix: Resolve CVE-2021{22901,22898,20266} for PS Base Image
Browse files Browse the repository at this point in the history
Closes: #443
Signed-off-by: William Lam <wlam@vmware.com>
  • Loading branch information
William Lam committed Jun 7, 2021
1 parent 0e3cfb8 commit fd738b3
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions examples/knative/powercli/kn-pcli-tag/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM projects.registry.vmware.com/veba/ce-pcli-base:1.0
FROM projects.registry.vmware.com/veba/ce-pcli-base:1.1
ENV TERM linux
ENV PORT 8080

COPY handler.ps1 handler.ps1

CMD ["pwsh","./server.ps1"]
CMD ["pwsh","./server.ps1"]
4 changes: 2 additions & 2 deletions examples/knative/powercli/kn-pcli-tag/function.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
metadata:
spec:
containers:
- image: projects.registry.vmware.com/veba/kn-pcli-tag:1.0
- image: projects.registry.vmware.com/veba/kn-pcli-tag:1.1
envFrom:
- secretRef:
name: tag-secret
Expand All @@ -38,4 +38,4 @@ spec:
ref:
apiVersion: serving.knative.dev/v1
kind: Service
name: kn-pcli-tag
name: kn-pcli-tag
2 changes: 1 addition & 1 deletion examples/knative/powershell/kn-ps-echo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM projects.registry.vmware.com/veba/ce-ps-base:1.0
FROM projects.registry.vmware.com/veba/ce-ps-base:1.1
ENV TERM linux
ENV PORT 8080

Expand Down
2 changes: 1 addition & 1 deletion examples/knative/powershell/kn-ps-echo/function.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
autoscaling.knative.dev/minScale: "1"
spec:
containers:
- image: projects.registry.vmware.com/veba/kn-ps-echo:1.0
- image: projects.registry.vmware.com/veba/kn-ps-echo:1.1
---
apiVersion: eventing.knative.dev/v1
kind: Trigger
Expand Down
4 changes: 2 additions & 2 deletions examples/knative/powershell/kn-ps-email/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM projects.registry.vmware.com/veba/ce-ps-base:1.0
FROM projects.registry.vmware.com/veba/ce-ps-base:1.1
ENV TERM linux
ENV PORT 8080

Expand All @@ -8,4 +8,4 @@ RUN pwsh -c "Install-Module -Name Send-MailKitMessage -RequiredVersion ${MAILKIT

COPY handler.ps1 handler.ps1

CMD ["pwsh","./server.ps1"]
CMD ["pwsh","./server.ps1"]
4 changes: 2 additions & 2 deletions examples/knative/powershell/kn-ps-email/function.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
metadata:
spec:
containers:
- image: projects.registry.vmware.com/veba/kn-ps-email:1.0
- image: projects.registry.vmware.com/veba/kn-ps-email:1.1
envFrom:
- secretRef:
name: email-secret
Expand All @@ -38,4 +38,4 @@ spec:
ref:
apiVersion: serving.knative.dev/v1
kind: Service
name: kn-ps-email
name: kn-ps-email
4 changes: 2 additions & 2 deletions examples/knative/powershell/kn-ps-slack/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM projects.registry.vmware.com/veba/ce-ps-base:1.0
FROM projects.registry.vmware.com/veba/ce-ps-base:1.1
ENV TERM linux
ENV PORT 8080

COPY handler.ps1 handler.ps1

CMD ["pwsh","./server.ps1"]
CMD ["pwsh","./server.ps1"]
4 changes: 2 additions & 2 deletions examples/knative/powershell/kn-ps-slack/function.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
metadata:
spec:
containers:
- image: projects.registry.vmware.com/veba/kn-ps-slack:1.0
- image: projects.registry.vmware.com/veba/kn-ps-slack:1.1
envFrom:
- secretRef:
name: slack-secret
Expand All @@ -38,4 +38,4 @@ spec:
ref:
apiVersion: serving.knative.dev/v1
kind: Service
name: kn-ps-slack
name: kn-ps-slack
4 changes: 2 additions & 2 deletions examples/knative/templates/Dockerfile.pcli
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM projects.registry.vmware.com/veba/ce-ps-base:1.0
FROM projects.registry.vmware.com/veba/ce-ps-base:1.1

ARG POWERCLI_VERSION="12.3.0.17860403"

RUN pwsh -c "\$ProgressPreference = \"SilentlyContinue\"; Install-Module VMware.PowerCLI -RequiredVersion ${POWERCLI_VERSION}" && \
pwsh -c 'Set-PowerCLIConfiguration -ParticipateInCEIP $true -confirm:$false'

CMD ["pwsh","./server.ps1"]
CMD ["pwsh","./server.ps1"]
Binary file modified examples/knative/templates/Dockerfile.ps
Binary file not shown.

0 comments on commit fd738b3

Please sign in to comment.