From 82e336cd87139521edb042a91cacda38419bf16b Mon Sep 17 00:00:00 2001 From: Jiri Petrlik Date: Tue, 24 Sep 2024 10:07:42 +0200 Subject: [PATCH] Delete custom notebook image We stoped building this image. I think we can delete it completely. --- .github/workflows/nightly-image-build.yaml | 50 ----- README.md | 6 - custom-nb-image/Dockerfile | 31 --- custom-nb-image/imagestream.yaml | 36 --- custom-nb-image/requirements/requirements.txt | 205 ------------------ 5 files changed, 328 deletions(-) delete mode 100644 .github/workflows/nightly-image-build.yaml delete mode 100644 custom-nb-image/Dockerfile delete mode 100644 custom-nb-image/imagestream.yaml delete mode 100644 custom-nb-image/requirements/requirements.txt diff --git a/.github/workflows/nightly-image-build.yaml b/.github/workflows/nightly-image-build.yaml deleted file mode 100644 index 4532c4a7e..000000000 --- a/.github/workflows/nightly-image-build.yaml +++ /dev/null @@ -1,50 +0,0 @@ -name: Nightly Image Build - -on: - workflow_dispatch: - push: - branches: - - main - -env: - PYTHON_VERSION: 3.8 - POETRY_VERSION: 1.5.1 - QUAY_ORGANIZATION: 'project-codeflare' - SDK_FILE: 'codeflare_sdk-0.0.0.dev0.tar.gz' - IMAGE_TAG: 'dev' - -jobs: - nightly-build: - runs-on: ubuntu-latest - steps: - - name: Checkout the repository - uses: actions/checkout@v4 - - name: Install Python - uses: actions/setup-python@v5 - with: - python-version: ${{ env.PYTHON_VERSION }} - - name: Install Poetry - uses: abatilo/actions-poetry@v2 - with: - poetry-version: ${{ env.POETRY_VERSION }} - - name: Run poetry install - run: poetry install --with docs - - name: Run poetry build - run: poetry build - - name: Copy SDK package - run: cp dist/${SDK_FILE} custom-nb-image - - name: Modify Dockerfile to use locally built SDK - run: | - sed -i "s/ARG SDK_VERSION=.*/COPY ${{ env.SDK_FILE }} ./" custom-nb-image/Dockerfile - sed -i "s/codeflare-sdk==.*/${{ env.SDK_FILE }}\\\\/" custom-nb-image/Dockerfile - - name: Image Build - working-directory: custom-nb-image - run: docker build -t quay.io/${{ env.QUAY_ORGANIZATION }}/notebook:${{ env.IMAGE_TAG }} . - - name: Login to Quay.io - uses: docker/login-action@v3 - with: - registry: quay.io - username: ${{ secrets.QUAY_ID }} - password: ${{ secrets.QUAY_TOKEN }} - - name: Image Push - run: docker push quay.io/${{ env.QUAY_ORGANIZATION }}/notebook:${{ env.IMAGE_TAG }} diff --git a/README.md b/README.md index a98f542c0..e166b4f53 100644 --- a/README.md +++ b/README.md @@ -40,9 +40,3 @@ The following instructions apply when doing release manually. This may be requir - If not present already, add the API token to Poetry. `poetry config pypi-token.pypi API_TOKEN` - Publish the Python package. `poetry publish` -- Change directory to custom-nb-image. `cd custom-nb-image` -- Set tag `export tag=TAG` -- Build the container image. `podman build --build-arg SDK_VERSION= -t quay.io/project-codeflare/notebook:${tag} .` -- Login to quay.io. `podman login quay.io` -- Push the image. `podman push quay.io/project-codeflare/notebook:${tag}` -- Push the stable image tag `podman push quay.io/project-codeflare/notebook:${tag} quay.io/project-codeflare/notebook:stable` diff --git a/custom-nb-image/Dockerfile b/custom-nb-image/Dockerfile deleted file mode 100644 index fca83e25f..000000000 --- a/custom-nb-image/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2022 IBM, Red Hat -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM quay.io/opendatahub/notebooks:jupyter-minimal-ubi9-python-3.9-2023a_20230302 - -COPY requirements/requirements.txt requirements.txt - -RUN pip install -r requirements.txt - -RUN pip uninstall pickle5 -y - -# Install codeflare-sdk and other libraries -ARG SDK_VERSION=0.* -RUN pip install codeflare-sdk==${SDK_VERSION} \ - datasets==2.6.1 \ - transformers==4.23.1 \ - evaluate==0.3.0 - -RUN chmod -R g+w /opt/app-root/lib/python3.9/site-packages && \ - fix-permissions /opt/app-root -P diff --git a/custom-nb-image/imagestream.yaml b/custom-nb-image/imagestream.yaml deleted file mode 100644 index 833a42fde..000000000 --- a/custom-nb-image/imagestream.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2022 IBM, Red Hat -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -kind: ImageStream -apiVersion: image.openshift.io/v1 -metadata: - name: codeflare-notebook - labels: - opendatahub.io/notebook-image: 'true' - annotations: - opendatahub.io/notebook-image-name: - "CodeFlare Notebook" - opendatahub.io/notebook-image-desc: "Custom Jupyter notebook image with CodeFlare SDK, Python 3.9, Ray 2.7.0 and PyTorch 1.12.1" -spec: - lookupPolicy: - local: true - tags: - - annotations: - openshift.io/imported-from: quay.io/project-codeflare/notebook - name: latest - from: - kind: DockerImage - name: quay.io/project-codeflare/notebook:latest - importPolicy: - scheduled: true diff --git a/custom-nb-image/requirements/requirements.txt b/custom-nb-image/requirements/requirements.txt deleted file mode 100644 index 35b5d5591..000000000 --- a/custom-nb-image/requirements/requirements.txt +++ /dev/null @@ -1,205 +0,0 @@ -# -# These requirements were autogenerated by pipenv -# To regenerate from the project's Pipfile, run: -# -# pipenv lock --requirements -# - --i https://pypi.org/simple -aiohttp-cors==0.7.0 -aiohttp==3.8.3 -aiorwlock==1.3.0 -aiosignal==1.2.0; python_version >= '3.6' -anyio==3.6.1; python_full_version >= '3.6.2' -argon2-cffi-bindings==21.2.0; python_version >= '3.6' -argon2-cffi==21.3.0; python_version >= '3.6' -asgiref==3.5.2; python_version >= '3.7' -asttokens==2.0.8 -astunparse==1.6.3 -async-timeout==4.0.2; python_version >= '3.6' -attrs==22.1.0; python_version >= '3.5' -babel==2.10.3; python_version >= '3.6' -backcall==0.2.0 -bcrypt==4.0.0; python_version >= '3.6' -beautifulsoup4==4.11.1; python_version >= '3.6' -black==22.8.0; python_full_version >= '3.6.2' -bleach==5.0.1; python_version >= '3.7' -blessed==1.19.1; python_version >= '2.7' -boto3==1.17.11 -botocore==1.20.112; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' -cachetools==5.2.0; python_version ~= '3.7' -certifi==2022.9.24; python_version >= '3.6' -cffi==1.15.1 -charset-normalizer==2.1.1; python_version >= '3.6' -click==8.0.4; python_version >= '3.6' -cloudpickle==2.2.0; python_version >= '3.6' -codeflare==0.1.2.dev0 -colorama==0.4.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -colorful==0.5.4 -contourpy==1.0.5; python_version >= '3.7' -cryptography==38.0.1; python_version >= '3.6' -cycler==0.11.0; python_version >= '3.6' -cython==0.29.32 -dask[array,dataframe]==2021.2.0 -dataclasses==0.6 -debugpy==1.6.3; python_version >= '3.7' -decorator==5.1.1; python_version >= '3.5' -defusedxml==0.7.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -distlib==0.3.6 -entrypoints==0.4; python_version >= '3.6' -executing==1.1.0 -fastapi==0.85.0 -fastjsonschema==2.16.2 -filelock==3.8.0; python_version >= '3.7' -flatbuffers==22.9.24 -fonttools==4.37.3; python_version >= '3.7' -frozenlist==1.3.1; python_version >= '3.7' -fsspec==2022.8.2 -future==0.18.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' -gitdb==4.0.9; python_version >= '3.6' -gitpython==3.1.27; python_version >= '3.7' -google-api-core==2.10.1; python_version >= '3.6' -google-auth==2.12.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' -googleapis-common-protos==1.56.4; python_version >= '3.7' -gpustat==1.0.0 -graphviz==0.20.1; python_version >= '3.7' -greenery==3.3.3 -grpcio==1.43.0; python_version >= '3.6' -h11==0.14.0; python_version >= '3.7' -hyperopt==0.2.5 -idna==3.4; python_version >= '3.5' -importlib-metadata==4.12.0; python_version < '3.10' -importlib-resources==5.9.0; python_version < '3.9' -ipykernel==6.16.0; python_version >= '3.7' -ipython-genutils==0.2.0 -ipython==8.5.0; python_version >= '3.8' -ipywidgets==8.0.2 -iso8601==1.1.0; python_version < '4' and python_full_version >= '3.6.2' -jedi==0.18.1; python_version >= '3.6' -jinja2==3.1.2; python_version >= '3.7' -jmespath==0.10.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' -joblib==1.2.0; python_version >= '3.7' -json5==0.9.10 -jsonref==0.2 -jsonschema==4.16.0; python_version >= '3.7' -jsonsubschema==0.0.6 -jupyter-client==7.3.5; python_version >= '3.7' -jupyter-core==4.11.1; python_version >= '3.7' -jupyter-server-mathjax==0.2.6; python_version >= '3.7' -jupyter-server==1.19.1; python_version >= '3.7' -jupyterlab-git==0.30.0 -jupyterlab-pygments==0.2.2; python_version >= '3.7' -jupyterlab-s3-browser==0.10.1 -jupyterlab-server==2.15.2; python_version >= '3.7' -jupyterlab-widgets==3.0.3; python_version >= '3.7' -jupyterlab==3.4.7; python_version >= '3.7' -kiwisolver==1.4.4; python_version >= '3.7' -kopf==1.35.6 -kubernetes==24.2.0 -lale==0.6.19 -locket==1.0.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -lxml==4.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -markupsafe==2.1.1; python_version >= '3.7' -matplotlib-inline==0.1.6; python_version >= '3.5' -matplotlib==3.6.0 -memory-profiler==0.60.0 -mistune==2.0.4 -msgpack==1.0.4 -multidict==6.0.2; python_version >= '3.7' -mypy-extensions==0.4.3 -nbclassic==0.4.3; python_version >= '3.7' -nbclient==0.6.8; python_version >= '3.7' -nbconvert==7.0.0; python_version >= '3.7' -nbdime==3.1.1; python_version >= '3.6' -nbformat==5.6.1; python_version >= '3.7' -nest-asyncio==1.5.5; python_version >= '3.5' -networkx==2.8.6; python_version >= '3.8' -notebook-shim==0.1.0; python_version >= '3.7' -notebook==6.4.12; python_version >= '3.7' -numpy==1.23.3 -nvidia-ml-py==11.495.46 -oauthlib==3.2.1; python_version >= '3.6' -opencensus-context==0.1.3 -opencensus==0.11.0 -openshift-client==1.0.18 -packaging==21.3 -pandas==1.5.0 -pandocfilters==1.5.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -paramiko==2.11.0 -parso==0.8.3; python_version >= '3.6' -partd==1.3.0 -pathspec==0.10.1; python_version >= '3.7' -pexpect==4.8.0; sys_platform != 'win32' -pickleshare==0.7.5 -pillow==9.2.0; python_version >= '3.7' -pkgutil-resolve-name==1.3.10; python_version < '3.9' -platformdirs==2.5.2; python_version >= '3.7' -portion==2.3.0; python_version ~= '3.6' -prometheus-client==0.13.1 -prompt-toolkit==3.0.31; python_full_version >= '3.6.2' -protobuf==3.20.1; python_version >= '3.7' -psutil==5.9.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -ptyprocess==0.7.0; os_name != 'nt' -pure-eval==0.2.2 -py-spy==0.3.14 -pyarrow==6.0.1 -pyasn1-modules==0.2.8 -pyasn1==0.4.8 -pycparser==2.21 -pydantic==1.10.2; python_version >= '3.7' -pygments==2.13.0; python_version >= '3.6' -pynacl==1.5.0; python_version >= '3.6' -pyparsing==3.0.9; python_full_version >= '3.6.8' -pyrsistent==0.18.1; python_version >= '3.7' -python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -python-dotenv==0.21.0 -python-json-logger==2.0.4; python_version >= '3.5' -pytz==2022.2.1 -pyyaml==6.0; python_version >= '3.6' -pyzmq==24.0.1; python_version >= '3.6' -ray[default]==2.5.0 -requests-oauthlib==1.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -requests==2.28.1; python_version >= '3.7' and python_version < '4' -rsa==4.9; python_version >= '3.6' -s3fs==0.3.4 -s3transfer==0.3.7 -scikit-learn==1.1.1 -scipy==1.8.1 -send2trash==1.8.0 -singleton-decorator==1.0.0 -six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -sklearn==0.0 -smart-open==6.2.0 -smmap==5.0.0; python_version >= '3.6' -sniffio==1.3.0; python_version >= '3.7' -sortedcontainers==2.4.0 -soupsieve==2.3.2.post1; python_version >= '3.6' -stack-data==0.5.1 -starlette==0.20.4 -tabulate==0.8.10 -tensorboardx==2.5.1 -terminado==0.15.0; python_version >= '3.7' -threadpoolctl==3.1.0; python_version >= '3.6' -tinycss2==1.1.1; python_version >= '3.6' -tomli==2.0.1; python_full_version < '3.11.0a7' -toolz==0.12.0 -torch==1.12.1 -torchvision==0.13.1 -tornado==6.2; python_version >= '3.7' -tqdm==4.64.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -traitlets==5.4.0; python_version >= '3.7' -tune-sklearn==0.4.3 -typing-extensions==4.3.0; python_version < '3.10' -urllib3==1.26.12 -uvicorn==0.16.0 -virtualenv==20.16.5; python_version >= '3.6' -wcwidth==0.2.5 -webencodings==0.5.1 -websocket-client==1.4.1; python_version >= '3.7' -wheel==0.37.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -widgetsnbextension==4.0.3; python_version >= '3.7' -wrapt==1.14.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -xgboost-ray==0.1.10 -xgboost==1.6.2 -yarl==1.8.1; python_version >= '3.7' -zipp==3.8.1; python_version < '3.10'