diff --git a/.github/workflows/dev_jupyter-pyspark-with-alibi-detect.yaml b/.github/workflows/dev_jupyter-pyspark-with-alibi-detect.yaml index 0e332bbf..dfd0a4f1 100644 --- a/.github/workflows/dev_jupyter-pyspark-with-alibi-detect.yaml +++ b/.github/workflows/dev_jupyter-pyspark-with-alibi-detect.yaml @@ -29,5 +29,5 @@ jobs: image-name: jupyter-pyspark-with-alibi-detect # TODO (@NickLarsenNZ): Use a versioned image with stackable0.0.0-dev or stackableXX.X.X so that # the demo is reproducable for the release and it will be automatically replaced for the release branch. - image-version: python-3.9 + image-version: python-3.13 containerfile-path: demos/signal-processing/Dockerfile-jupyter diff --git a/.github/workflows/dev_nifi.yaml b/.github/workflows/dev_nifi.yaml index ccd1d41d..b47e9153 100644 --- a/.github/workflows/dev_nifi.yaml +++ b/.github/workflows/dev_nifi.yaml @@ -30,5 +30,5 @@ jobs: image-name: nifi # TODO (@NickLarsenNZ): Use a versioned image with stackable0.0.0-dev or stackableXX.X.X so that # the demo is reproducable for the release and it will be automatically replaced for the release branch. - image-version: 2.9.0-postgresql + image-version: 2.12.0-postgresql containerfile-path: demos/signal-processing/Dockerfile-nifi diff --git a/demos/signal-processing/Dockerfile-jupyter b/demos/signal-processing/Dockerfile-jupyter index a21ef4c8..317fe281 100644 --- a/demos/signal-processing/Dockerfile-jupyter +++ b/demos/signal-processing/Dockerfile-jupyter @@ -1,4 +1,6 @@ -FROM jupyter/pyspark-notebook:python-3.9 +# Find the latest python version here: +# https://quay.io/repository/jupyter/pyspark-notebook?tab=tags (use the tag search) +FROM quay.io/jupyter/pyspark-notebook:python-3.13 COPY demos/signal-processing/requirements.txt . diff --git a/demos/signal-processing/Dockerfile-nifi b/demos/signal-processing/Dockerfile-nifi index 744d3241..f040bab6 100644 --- a/demos/signal-processing/Dockerfile-nifi +++ b/demos/signal-processing/Dockerfile-nifi @@ -1,13 +1,13 @@ -FROM oci.stackable.tech/sdp/nifi:2.9.0-stackable0.0.0-dev +FROM oci.stackable.tech/sdp/nifi:2.12.0-stackable0.0.0-dev # This is the postgresql JDBC driver from https://jdbc.postgresql.org/download/ # There appear to be no signatures to validate against 😬 # -# VERSION="42.7.10" +# VERSION="42.7.13" # curl -O "https://jdbc.postgresql.org/download/postgresql-$VERSION.jar" # curl --fail -u "your_username" --upload-file "postgresql-$VERSION.jar" 'https://repo.stackable.tech/repository/misc/jdbc/' # rm "postgresql-$VERSION.jar" # IMPORTANT (@NickLarsenNZ): Changing this version requires a change in the NiFi template (DownloadAndWriteToDB.json) -ARG DRIVER_VERSION="42.7.10" +ARG DRIVER_VERSION="42.7.13" RUN curl --fail -o "/stackable/nifi/postgresql-$DRIVER_VERSION.jar" "https://repo.stackable.tech/repository/misc/jdbc/postgresql-$DRIVER_VERSION.jar" diff --git a/demos/signal-processing/DownloadAndWriteToDB.json b/demos/signal-processing/DownloadAndWriteToDB.json index 018e033c..376f0a80 100644 --- a/demos/signal-processing/DownloadAndWriteToDB.json +++ b/demos/signal-processing/DownloadAndWriteToDB.json @@ -24,7 +24,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-nar", - "version": "2.6.0" + "version": "2.12.0" }, "properties": { "Proxy Host": null, @@ -337,7 +337,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-nar", - "version": "2.6.0" + "version": "2.12.0" }, "properties": { "put-db-record-allow-multiple-statements": "false", @@ -538,7 +538,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-nar", - "version": "2.6.0" + "version": "2.12.0" }, "properties": { "Support Fragmented Transactions": "false", @@ -729,7 +729,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-dbcp-service-nar", - "version": "2.6.0" + "version": "2.12.0" }, "properties": { "dbcp-min-idle-conns": "0", @@ -746,7 +746,7 @@ "Database User": "admin", "kerberos-user-service": null, "dbcp-soft-min-evictable-idle-time": "-1", - "database-driver-locations": "/stackable/nifi/postgresql-42.7.10.jar", + "database-driver-locations": "/stackable/nifi/postgresql-42.7.13.jar", "dbcp-max-idle-conns": "8" }, "propertyDescriptors": { @@ -873,7 +873,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-services-api-nar", - "version": "2.6.0" + "version": "2.12.0" } } ], @@ -891,7 +891,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-record-serialization-services-nar", - "version": "2.6.0" + "version": "2.12.0" }, "properties": { "ignore-csv-header": "false", @@ -1064,7 +1064,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-services-api-nar", - "version": "2.6.0" + "version": "2.12.0" } } ], diff --git a/demos/signal-processing/requirements.txt b/demos/signal-processing/requirements.txt index 21dcca7c..c663b521 100644 --- a/demos/signal-processing/requirements.txt +++ b/demos/signal-processing/requirements.txt @@ -1,2 +1,2 @@ -psycopg2-binary==2.9.9 -alibi-detect==0.11.4 +psycopg2-binary==2.9.13 +alibi-detect==0.13.0 diff --git a/docs/modules/demos/pages/signal-processing.adoc b/docs/modules/demos/pages/signal-processing.adoc index 1d07c0d4..21c95c27 100644 --- a/docs/modules/demos/pages/signal-processing.adoc +++ b/docs/modules/demos/pages/signal-processing.adoc @@ -90,7 +90,7 @@ To achieve the same imports as mentioned in the previous section, build the Dock [source,console] ---- -FROM jupyter/pyspark-notebook:python-3.9 +FROM quay.io/jupyter/pyspark-notebook:python-3.13 COPY demos/signal-processing/requirements.txt . @@ -102,8 +102,8 @@ Where `requirements.txt` contains: [source,console] ---- -psycopg2-binary==2.9.9 -alibi-detect==0.11.4 +psycopg2-binary==2.9.13 +alibi-detect==0.13.0 ---- NOTE: Using a custom image requires access to a repository where the image can be made available. diff --git a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml index 5fb94dbe..62cba760 100644 --- a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml +++ b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml @@ -5,7 +5,7 @@ metadata: name: nifi spec: image: - productVersion: 2.9.0 + productVersion: 2.12.0 clusterConfig: authentication: - authenticationClass: nifi-admin-credentials diff --git a/stacks/nifi-kafka-druid-superset-s3/nifi.yaml b/stacks/nifi-kafka-druid-superset-s3/nifi.yaml index e624ebfb..39c8bff1 100644 --- a/stacks/nifi-kafka-druid-superset-s3/nifi.yaml +++ b/stacks/nifi-kafka-druid-superset-s3/nifi.yaml @@ -5,7 +5,7 @@ metadata: name: nifi spec: image: - productVersion: 2.9.0 + productVersion: 2.12.0 clusterConfig: authentication: - authenticationClass: nifi-admin-credentials diff --git a/stacks/signal-processing/nifi.yaml b/stacks/signal-processing/nifi.yaml index 6c7d84f6..b6143df0 100644 --- a/stacks/signal-processing/nifi.yaml +++ b/stacks/signal-processing/nifi.yaml @@ -5,10 +5,10 @@ metadata: name: nifi spec: image: - productVersion: 2.9.0 + productVersion: 2.12.0 # TODO (@NickLarsenNZ): Use a versioned image with stackable0.0.0-dev or stackableXX.X.X so that # the demo is reproducable for the release and it will be automatically replaced for the release branch. - custom: oci.stackable.tech/demos/nifi:2.9.0-postgresql + custom: oci.stackable.tech/demos/nifi:2.12.0-postgresql # pullPolicy: IfNotPresent clusterConfig: authentication: