Remove the extra python base images (deephaven#3335)

.github/workflows/build-ci.yml

@@ -60,76 +60,6 @@ jobs:
             type=raw,enable=${{ startsWith(github.ref, 'refs/heads/release/v0.19.') }},value=latest
             type=ref,event=branch
 
-      - name: Docker meta server nltk
-        id: docker_meta_server_nltk
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/server-nltk-netty
-          flavor: |
-            latest=false
-          tags: |
-            type=edge,branch=main
-            type=raw,priority=950,enable=${{ startsWith(github.ref, 'refs/heads/release/v') }},value=${{ steps.semver.outputs.semver }}
-            type=raw,enable=${{ startsWith(github.ref, 'refs/heads/release/v0.19.') }},value=latest
-            type=ref,event=branch
-
-      - name: Docker meta server pytorch
-        id: docker_meta_server_pytorch
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/server-pytorch-netty
-          flavor: |
-            latest=false
-          tags: |
-            type=edge,branch=main
-            type=raw,priority=950,enable=${{ startsWith(github.ref, 'refs/heads/release/v') }},value=${{ steps.semver.outputs.semver }}
-            type=raw,enable=${{ startsWith(github.ref, 'refs/heads/release/v0.19.') }},value=latest
-            type=ref,event=branch
-
-      - name: Docker meta server sklearn
-        id: docker_meta_server_sklearn
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/server-sklearn-netty
-          flavor: |
-            latest=false
-          tags: |
-            type=edge,branch=main
-            type=raw,priority=950,enable=${{ startsWith(github.ref, 'refs/heads/release/v') }},value=${{ steps.semver.outputs.semver }}
-            type=raw,enable=${{ startsWith(github.ref, 'refs/heads/release/v0.19.') }},value=latest
-            type=ref,event=branch
-
-      - name: Docker meta server tensorflow
-        id: docker_meta_server_tensorflow
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/server-tensorflow-netty
-          flavor: |
-            latest=false
-          tags: |
-            type=edge,branch=main
-            type=raw,priority=950,enable=${{ startsWith(github.ref, 'refs/heads/release/v') }},value=${{ steps.semver.outputs.semver }}
-            type=raw,enable=${{ startsWith(github.ref, 'refs/heads/release/v0.19.') }},value=latest
-            type=ref,event=branch
-
-      - name: Docker meta server all-ai
-        id: docker_meta_server_all_ai
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/server-all-ai-netty
-          flavor: |
-            latest=false
-          tags: |
-            type=edge,branch=main
-            type=raw,priority=950,enable=${{ startsWith(github.ref, 'refs/heads/release/v') }},value=${{ steps.semver.outputs.semver }}
-            type=raw,enable=${{ startsWith(github.ref, 'refs/heads/release/v0.19.') }},value=latest
-            type=ref,event=branch
-
       - name: Docker meta server slim
         id: docker_meta_server_slim
         uses: docker/metadata-action@v3
@@ -186,66 +116,6 @@ jobs:
           context: ./docker/server/build/context/
           push: false
 
-      - name: Docker build server nltk
-        uses: docker/build-push-action@v2
-        with:
-          build-args: |
-            BASE=deephaven/nltk-base:local-build
-            SERVER=server-nltk-netty
-            DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
-          tags: ${{ steps.docker_meta_server_nltk.outputs.tags }}
-          builder: ${{ steps.buildx.outputs.name }}
-          context: ./docker/server/build/context/
-          push: false
-
-      - name: Docker build server pytorch
-        uses: docker/build-push-action@v2
-        with:
-          build-args: |
-            BASE=deephaven/pytorch-base:local-build
-            SERVER=server-pytorch-netty
-            DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
-          tags: ${{ steps.docker_meta_server_pytorch.outputs.tags }}
-          builder: ${{ steps.buildx.outputs.name }}
-          context: ./docker/server/build/context/
-          push: false
-
-      - name: Docker build server sklearn
-        uses: docker/build-push-action@v2
-        with:
-          build-args: |
-            BASE=deephaven/sklearn-base:local-build
-            SERVER=server-sklearn-netty
-            DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
-          tags: ${{ steps.docker_meta_server_sklearn.outputs.tags }}
-          builder: ${{ steps.buildx.outputs.name }}
-          context: ./docker/server/build/context/
-          push: false
-
-      - name: Docker build server tensorflow
-        uses: docker/build-push-action@v2
-        with:
-          build-args: |
-            BASE=deephaven/tensorflow-base:local-build
-            SERVER=server-tensorflow-netty
-            DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
-          tags: ${{ steps.docker_meta_server_tensorflow.outputs.tags }}
-          builder: ${{ steps.buildx.outputs.name }}
-          context: ./docker/server/build/context/
-          push: false
-
-      - name: Docker build server all-ai
-        uses: docker/build-push-action@v2
-        with:
-          build-args: |
-            BASE=deephaven/all-ai-base:local-build
-            SERVER=server-all-ai-netty
-            DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
-          tags: ${{ steps.docker_meta_server_all_ai.outputs.tags }}
-          builder: ${{ steps.buildx.outputs.name }}
-          context: ./docker/server/build/context/
-          push: false
-
       # Note: server-slim does not need BASE/SERVER build-args like the other server images
       - name: Docker build server slim
         uses: docker/build-push-action@v2
@@ -263,11 +133,6 @@ jobs:
           ./docker/registry/protoc-base/build/crane/retag.sh
           ./docker/registry/slim-base/build/crane/retag.sh
           ./docker/registry/server-base/build/crane/retag.sh
-          ./docker/registry/nltk-base/build/crane/retag.sh
-          ./docker/registry/pytorch-base/build/crane/retag.sh
-          ./docker/registry/sklearn-base/build/crane/retag.sh
-          ./docker/registry/tensorflow-base/build/crane/retag.sh
-          ./docker/registry/all-ai-base/build/crane/retag.sh
 
   grpc-proxy:
     runs-on: ubuntu-22.04

docker/README.md

@@ -8,20 +8,12 @@ The `docker-server-slim` project produces the image `deephaven/server-slim-netty
 
 The `docker-server` project produces the images:
 * `deephaven/server-netty:local-build`
-* `deephaven/server-nltk-netty:local-build`
-* `deephaven/server-pytorch-netty:local-build`
-* `deephaven/server-sklearn-netty:local-build`
-* `deephaven/server-tensorflow-netty:local-build`
 
 When the base images for `docker-server` are updated, the requirements.txt files may need to be updated.
 This can currently be done manually via:
 
 ```shell
 docker run --rm ghcr.io/deephaven/server-base:latest pip freeze > docker/server/src/main/server/requirements.txt
-docker run --rm ghcr.io/deephaven/nltk-base:latest pip freeze > docker/server/src/main/server-nltk/requirements.txt
-docker run --rm ghcr.io/deephaven/pytorch-base:latest pip freeze > docker/server/src/main/server-pytorch/requirements.txt
-docker run --rm ghcr.io/deephaven/sklearn-base:latest pip freeze > docker/server/src/main/server-sklearn/requirements.txt
-docker run --rm ghcr.io/deephaven/tensorflow-base:latest pip freeze > docker/server/src/main/server-tensorflow/requirements.txt
 ```
 
 ## runtime-base

docker/registry/scripts/compare-amd64-arm64.sh

@@ -12,27 +12,7 @@ __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 __gradlew="${__dir}/../../../gradlew"
 
 server_base_image_id="$(${__gradlew} -q docker-server-base:showImageId)"
-nltk_base_image_id="$(${__gradlew} -q docker-nltk-base:showImageId)"
-pytorch_base_image_id="$(${__gradlew} -q docker-pytorch-base:showImageId)"
-sklearn_base_image_id="$(${__gradlew} -q docker-sklearn-base:showImageId)"
-tensorflow_base_image_id="$(${__gradlew} -q docker-tensorflow-base:showImageId)"
 
 podman run -q --rm --override-arch arm64 "${server_base_image_id}" pip freeze > build/server-base.arm64.txt
 podman run -q --rm --override-arch amd64 "${server_base_image_id}" pip freeze > build/server-base.amd64.txt
 diff -q build/server-base.amd64.txt build/server-base.arm64.txt
-
-podman run -q --rm --override-arch arm64 "${nltk_base_image_id}" pip freeze > build/nltk-base.arm64.txt
-podman run -q --rm --override-arch amd64 "${nltk_base_image_id}" pip freeze > build/nltk-base.amd64.txt
-diff -q build/nltk-base.amd64.txt build/nltk-base.arm64.txt
-
-podman run -q --rm --override-arch arm64 "${pytorch_base_image_id}" pip freeze > build/pytorch-base.arm64.txt
-podman run -q --rm --override-arch amd64 "${pytorch_base_image_id}" pip freeze > build/pytorch-base.amd64.txt
-diff -q build/pytorch-base.amd64.txt build/pytorch-base.arm64.txt
-
-podman run -q --rm --override-arch arm64 "${sklearn_base_image_id}" pip freeze > build/sklearn-base.arm64.txt
-podman run -q --rm --override-arch amd64 "${sklearn_base_image_id}" pip freeze > build/sklearn-base.amd64.txt
-diff -q build/sklearn-base.amd64.txt build/sklearn-base.arm64.txt
-
-podman run -q --rm --override-arch arm64 "${tensorflow_base_image_id}" pip freeze > build/tensorflow-base.arm64.txt
-podman run -q --rm --override-arch amd64 "${tensorflow_base_image_id}" pip freeze > build/tensorflow-base.amd64.txt
-diff -q build/tensorflow-base.amd64.txt build/tensorflow-base.arm64.txt

docker/registry/scripts/update-requirements.sh

@@ -14,20 +14,10 @@ __gradlew="${__dir}/../../../gradlew"
 
 # Get the (potentially) new IDs
 server_base_image_id="$(${__gradlew} -q docker-server-base:showImageId)"
-nltk_base_image_id="$(${__gradlew} -q docker-nltk-base:showImageId)"
-pytorch_base_image_id="$(${__gradlew} -q docker-pytorch-base:showImageId)"
-sklearn_base_image_id="$(${__gradlew} -q docker-sklearn-base:showImageId)"
-tensorflow_base_image_id="$(${__gradlew} -q docker-tensorflow-base:showImageId)"
-all_ai_base_image_id="$(${__gradlew} -q docker-all-ai-base:showImageId)"
 
 # Write down the (potentially) new requirements
 # Need to manually remove pkg-resources
 # https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1635463
 docker run --rm "${server_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server-jetty/src/main/server-jetty/requirements.txt"
 docker run --rm "${server_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-netty/requirements.txt"
-docker run --rm "${nltk_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-nltk-netty/requirements.txt"
-docker run --rm "${pytorch_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-pytorch-netty/requirements.txt"
-docker run --rm "${sklearn_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-sklearn-netty/requirements.txt"
-docker run --rm "${tensorflow_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-tensorflow-netty/requirements.txt"
-docker run --rm "${all_ai_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-all-ai-netty/requirements.txt"
 

docker/server-jetty/build.gradle

@@ -10,7 +10,6 @@ def targetArch = Architecture.targetArchitecture(project)
 
 def baseMapAmd64 = [
         'server-base': 'server-jetty',
-        'all-ai-base': 'server-all-ai-jetty',
 ]
 
 // Only the server image is supported on arm64

docker/server/build.gradle

@@ -10,11 +10,6 @@ def targetArch = Architecture.targetArchitecture(project)
 
 def baseMapAmd64 = [
         'server-base': 'server-netty',
-        'nltk-base': 'server-nltk-netty',
-        'pytorch-base': 'server-pytorch-netty',
-        'sklearn-base': 'server-sklearn-netty',
-        'tensorflow-base': 'server-tensorflow-netty',
-        'all-ai-base': 'server-all-ai-netty'
 ]
 
 // Only the server image is supported on arm64