Skip to content

Commit ef9bd5e

Browse files
committed
chore(cyclonedx-bom): Bump to 6.0.0
1 parent 9ef4faf commit ef9bd5e

File tree

5 files changed

+12
-2
lines changed

5 files changed

+12
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ All notable changes to this project will be documented in this file.
3939
- jmx_exporter: Bump products to use `1.2.0` ([#xxx]).
4040
- kubectl: Bump products to use `1.33.0` ([#xxx]).
4141
- yq: Bump products to use `4.45.2` ([#xxx]).
42+
- cyclonedx-bom: Bump airflow and superset to use `6.0.0` ([#xxx]).
4243

4344
### Fixed
4445

airflow/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ ARG STATSD_EXPORTER
2929
ARG PYTHON
3030
ARG TARGETARCH
3131
ARG STACKABLE_USER_UID
32+
ARG S3FS
33+
ARG CYCLONEDX_BOM
3234

3335
COPY airflow/constraints-${PRODUCT}-python${PYTHON}.txt /tmp/constraints.txt
3436
COPY --from=opa-auth-manager-builder /tmp/opa-auth-manager/dist/opa_auth_manager-0.1.0-py3-none-any.whl /tmp/
@@ -68,7 +70,7 @@ source /stackable/app/bin/activate
6870
pip install --no-cache-dir --upgrade pip
6971
pip install --no-cache-dir apache-airflow[${AIRFLOW_EXTRAS}]==${PRODUCT} --constraint /tmp/constraints.txt
7072
# Needed for pandas S3 integration to e.g. write and read csv and parquet files to/from S3
71-
pip install --no-cache-dir s3fs==2024.9.0 cyclonedx-bom==5.0.0
73+
pip install --no-cache-dir s3fs==${S3FS} cyclonedx-bom==${CYCLONEDX_BOM}
7274
# Needed for OIDC
7375
pip install --no-cache-dir Flask_OIDC==2.2.0 Flask-OpenID==1.3.1
7476

airflow/versions.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"product": "2.9.3",
44
"python": "3.9",
55
"git_sync": "v4.4.0",
6+
"s3fs": "2024.9.0",
7+
"cyclonedx_bom": "6.0.0",
68
"statsd_exporter": "0.28.0",
79
"tini": "0.19.0",
810
"vector": "0.43.1",
@@ -11,6 +13,8 @@
1113
"product": "2.10.4",
1214
"python": "3.12",
1315
"git_sync": "v4.4.0",
16+
"s3fs": "2024.9.0",
17+
"cyclonedx_bom": "6.0.0",
1418
"statsd_exporter": "0.28.0",
1519
"tini": "0.19.0",
1620
"vector": "0.43.1",

superset/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ARG PYTHON
4040
ARG AUTHLIB
4141
ARG TARGETARCH
4242
ARG TARGETOS
43+
ARG CYCLONEDX_BOM
4344

4445
COPY superset/constraints-${PRODUCT}.txt /tmp/constraints.txt
4546
COPY --from=opa-authorizer-builder /tmp/opa-authorizer/dist/opa_authorizer-0.1.0-py3-none-any.whl /tmp/
@@ -109,7 +110,7 @@ RUN python3 -m venv /stackable/app \
109110
--no-cache-dir \
110111
--upgrade \
111112
python-json-logger \
112-
cyclonedx-bom \
113+
cyclonedx-bom==${CYCLONEDX_BOM} \
113114
&& if [ -n "$AUTHLIB" ]; then pip install Authlib==${AUTHLIB}; fi && \
114115
pip install --no-cache-dir /tmp/opa_authorizer-0.1.0-py3-none-any.whl
115116

superset/versions.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
"product": "4.0.2",
44
"python": "3.9",
5+
"cyclonedx_bom": "6.0.0",
56
"vector": "0.43.1",
67
"statsd_exporter": "0.28.0",
78
"authlib": "1.2.1", # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.4.1/requirements/extra.txt#L7
@@ -10,6 +11,7 @@
1011
{
1112
"product": "4.1.1",
1213
"python": "3.9", # 3.11 support was merged in January 2025 (two months after 4.1.1 release), 3.10 is not available in our UBI image, so we need to stay on 3.9 for now
14+
"cyclonedx_bom": "6.0.0",
1315
"vector": "0.43.1",
1416
"statsd_exporter": "0.28.0",
1517
"authlib": "1.2.1", # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7

0 commit comments

Comments
 (0)