Skip to content

Commit 685e87c

Browse files
Update depenency to avoid CVE-2022-4904 (#54)
* Update SDK on v0.3.2 * Update packages * Update NOTICE-3RD-PARTY-CONTENT.md * Update NOTICE.md * Update Dockerfile * Fix SDK version --------- Co-authored-by: BjoernAtBosch <Bjoern.Hornburg@de.bosch.com>
1 parent 56ffb6b commit 685e87c

File tree

9 files changed

+17
-16
lines changed

9 files changed

+17
-16
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# SPDX-License-Identifier: Apache-2.0
1414

15-
FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.2
15+
FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.3
1616

1717
ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE
1818
ENV REINSTALL_CMAKE_VERSION_FROM_SOURCE="${REINSTALL_CMAKE_VERSION_FROM_SOURCE:-none}"

.github/workflows/build-docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
build-image:
3939
name: "Building image (${{ matrix.component.name }})"
4040
runs-on: ubuntu-latest
41-
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.2
41+
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.3
4242
strategy:
4343
matrix:
4444
component: ${{ fromJson(inputs.deployment-matrix-str) }}

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ on:
3838
jobs:
3939
build-and-publish:
4040
runs-on: ubuntu-22.04
41-
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.2
41+
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.3
4242
name: "Build, Test and Lint"
4343
steps:
4444
- name: Checkout repository

.github/workflows/ensure-lifecycle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
jobs:
2828
check-sync:
2929
runs-on: ubuntu-22.04
30-
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.2
30+
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.3
3131
name: Are files in sync?
3232

3333
steps:

.velocitas.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
},
77
{
88
"name": "devenv-github-workflows",
9-
"version": "v2.0.7"
9+
"version": "v2.0.9"
1010
},
1111
{
1212
"name": "devenv-github-templates",
1313
"version": "v1.0.1"
1414
},
1515
{
1616
"name": "devenv-devcontainer-setup",
17-
"version": "v1.1.8"
17+
"version": "v1.1.9"
1818
}
1919
],
2020
"variables": {

NOTICE-3RD-PARTY-CONTENT.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
|distlib|0.3.6|Python Software Foundation License|
1414
|distro|1.7.0|Apache 2.0|
1515
|fasteners|0.18|Apache 2.0|
16-
|filelock|3.12.0|The Unlicense (Unlicense)|
16+
|filelock|3.12.2|The Unlicense (Unlicense)|
1717
|gcovr|5.2|BSD|
1818
|identify|2.5.24|MIT|
1919
|idna|3.4|BSD|
2020
|Jinja2|3.1.2|New BSD|
2121
|lxml|4.9.2|New BSD|
22-
|MarkupSafe|2.1.2|New BSD|
22+
|MarkupSafe|2.1.3|New BSD|
2323
|node-semver|0.6.1|MIT|
2424
|nodeenv|1.8.0|BSD|
2525
|patch-ng|1.17.4|MIT|
26-
|platformdirs|3.5.1|MIT|
26+
|platformdirs|3.8.0|MIT|
2727
|pluginbase|1.0.1|BSD|
2828
|pre-commit|2.20.0|MIT|
2929
|Pygments|2.15.1|Simplified BSD|
@@ -36,7 +36,7 @@
3636
|toml|0.10.2|MIT|
3737
|tqdm|4.65.0|MIT<br/>Mozilla Public License 2.0 (MPL 2.0)|
3838
|urllib3|1.26.16|MIT|
39-
|virtualenv|20.23.0|MIT|
39+
|virtualenv|20.23.1|MIT|
4040
## Workflows
4141
| Dependency | Version | License |
4242
|:-----------|:-------:|--------:|

NOTICE.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,19 @@ The C++ dependencies should be normally also listed in the auto-generated notice
4848
Due to the limited Conan support of the Pivotal License Finder currently used in our [License Check](https://github.com/eclipse-velocitas/license-check),
4949
they are given here (manually added) for time being:
5050

51+
5152
| Dependency | Version | License |
5253
|:-----------|:-------:|--------:|
5354
|abseil|20220623.0|Apache 2.0|
54-
|c-ares|1.18.1|c-ares (MIT-style)|
55-
|cpr|1.9.3|MIT|
55+
|c-ares|1.19.1|c-ares (MIT-style)|
56+
|cpr|1.10.1|MIT|
5657
|fmt|9.1.0|MIT|
5758
|googleapis|cci.20221108|Apache 2.0|
5859
|grpc|1.50.1|Apache 2.0|
5960
|grpc-proto|cci.20220627|Apache 2.0|
60-
|libcurl|7.87.0|CURL|
61+
|libcurl|8.1.2|CURL|
6162
|nlohmann_json|3.11.2|MIT|
62-
|openssl|1.1.1t|OpenSSL License AND SSLeay License|
63+
|openssl|1.1.1u|OpenSSL License AND SSLeay License|
6364
|paho-mqtt-c|1.3.9|EPL 2.0 AND EDL 1.0|
6465
|paho-mqtt-cpp|1.2.0|EPL 1.0 AND EDL 1.0|
6566
|protobuf|3.21.9|Google License|

app/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# syntax = docker/dockerfile:1.2
1616

17-
FROM ghcr.io/eclipse-velocitas/vehicle-app-cpp-sdk:v0.3.1 as builder
17+
FROM ghcr.io/eclipse-velocitas/vehicle-app-cpp-sdk:v0.3.2 as builder
1818

1919
RUN apk update && \
2020
apk add ninja && \

0 commit comments

Comments
 (0)