From a4cd567a7c8d3c7e07d88cfb25fb6956cda7ea1f Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Mon, 13 May 2024 21:43:14 +0800 Subject: [PATCH] Update base image (#1677) Signed-off-by: Kevin Su --- .github/workflows/checks.yml | 2 +- examples/databricks_agent/Dockerfile | 2 +- examples/databricks_plugin/Dockerfile | 2 +- examples/k8s_dask_plugin/Dockerfile | 2 +- examples/k8s_dask_plugin/k8s_dask_plugin/dask_example.py | 2 +- examples/k8s_spark_plugin/Dockerfile | 2 +- .../k8s_spark_plugin/k8s_spark_plugin/dataframe_passing.py | 6 +----- examples/mnist_classifier/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 1caf1c74c..cb2d93a16 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -53,7 +53,7 @@ jobs: # TODO: Register and update the examples below. (onnx_plugin, feast_integration, etc) echo "PACKAGES=$(find examples -maxdepth 1 -type d -exec basename '{}' \; \ | grep -v -e 'testing' -e 'examples' \ - | grep -v -e 'airflow_plugin' -e 'forecasting_sales' -e 'onnx_plugin' -e 'feast_integration' -e 'modin_plugin' -e 'sagemaker_inference_agent' \ + | grep -v -e 'airflow_plugin' -e 'forecasting_sales' -e 'onnx_plugin' -e 'feast_integration' -e 'modin_plugin' -e 'sagemaker_inference_agent' -e 'mnist_classifier' \ | sort \ | jq --raw-input . \ | jq --slurp . \ diff --git a/examples/databricks_agent/Dockerfile b/examples/databricks_agent/Dockerfile index e789dd403..8b9715f82 100644 --- a/examples/databricks_agent/Dockerfile +++ b/examples/databricks_agent/Dockerfile @@ -1,4 +1,4 @@ -FROM databricksruntime/standard:12.2-LTS +FROM databricksruntime/standard:14.3-LTS LABEL org.opencontainers.image.source=https://github.com/flyteorg/flytesnacks ENV VENV /opt/venv diff --git a/examples/databricks_plugin/Dockerfile b/examples/databricks_plugin/Dockerfile index e789dd403..8b9715f82 100644 --- a/examples/databricks_plugin/Dockerfile +++ b/examples/databricks_plugin/Dockerfile @@ -1,4 +1,4 @@ -FROM databricksruntime/standard:12.2-LTS +FROM databricksruntime/standard:14.3-LTS LABEL org.opencontainers.image.source=https://github.com/flyteorg/flytesnacks ENV VENV /opt/venv diff --git a/examples/k8s_dask_plugin/Dockerfile b/examples/k8s_dask_plugin/Dockerfile index ab1d39379..2cf2e16d6 100644 --- a/examples/k8s_dask_plugin/Dockerfile +++ b/examples/k8s_dask_plugin/Dockerfile @@ -1,7 +1,7 @@ # ###################### # NOTE: For CI/CD only # ######################## -FROM ubuntu:focal +FROM ubuntu:latest LABEL org.opencontainers.image.source https://github.com/flyteorg/flytesnacks WORKDIR /root diff --git a/examples/k8s_dask_plugin/k8s_dask_plugin/dask_example.py b/examples/k8s_dask_plugin/k8s_dask_plugin/dask_example.py index 6e824b9e0..a5b2a1077 100644 --- a/examples/k8s_dask_plugin/k8s_dask_plugin/dask_example.py +++ b/examples/k8s_dask_plugin/k8s_dask_plugin/dask_example.py @@ -12,7 +12,7 @@ # %% [markdown] # Create an `ImageSpec` to encompass all the dependencies needed for the Dask task. # %% -custom_image = ImageSpec(name="flyte-dask-plugin", registry="ghcr.io/flyteorg", packages=["flytekitplugins-dask"]) +custom_image = ImageSpec(registry="ghcr.io/flyteorg", packages=["flytekitplugins-dask"]) # %% [markdown] # :::{important} diff --git a/examples/k8s_spark_plugin/Dockerfile b/examples/k8s_spark_plugin/Dockerfile index 03ae38fcc..b09db3278 100644 --- a/examples/k8s_spark_plugin/Dockerfile +++ b/examples/k8s_spark_plugin/Dockerfile @@ -1,7 +1,7 @@ # ###################### # NOTE: For CI/CD only # ######################## -FROM apache/spark-py:3.3.1 +FROM apache/spark-py:v3.4.0 LABEL org.opencontainers.image.source https://github.com/flyteorg/flytesnacks WORKDIR /root diff --git a/examples/k8s_spark_plugin/k8s_spark_plugin/dataframe_passing.py b/examples/k8s_spark_plugin/k8s_spark_plugin/dataframe_passing.py index 34e1748de..f672ebc6e 100644 --- a/examples/k8s_spark_plugin/k8s_spark_plugin/dataframe_passing.py +++ b/examples/k8s_spark_plugin/k8s_spark_plugin/dataframe_passing.py @@ -14,11 +14,7 @@ from flytekit import ImageSpec, Resources, kwtypes, task, workflow from flytekit.types.structured.structured_dataset import StructuredDataset from flytekitplugins.spark import Spark - -try: - from typing import Annotated -except ImportError: - from typing_extensions import Annotated +from typing_extensions import Annotated # %% [markdown] # Create an `ImageSpec` to automate the retrieval of a prebuilt Spark image. diff --git a/examples/mnist_classifier/Dockerfile b/examples/mnist_classifier/Dockerfile index 79ddd4179..9fd8d5f14 100644 --- a/examples/mnist_classifier/Dockerfile +++ b/examples/mnist_classifier/Dockerfile @@ -1,4 +1,4 @@ -FROM pytorch/pytorch:1.11.0-cuda11.3-cudnn8-runtime +FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime LABEL org.opencontainers.image.source https://github.com/flyteorg/flytesnacks WORKDIR /root