Remove server/ and web/ related blocks

README.md

@@ -1,56 +1,9 @@
 # base-images
 
-This repository is responsible for producing a set of images for use with [deephaven-core](https://github.com/deephaven/deephaven-core).
-
-## Server images
-
-Note: some of this documentation may be out of date. The server-specific `-base` image building process has moved to [deephaven-server-docker](https://github.com/deephaven/deephaven-server-docker).
-
-### java
-
-Based on `debian:buster-slim`, installs OpenJDK 11.
-
-Produced for platforms amd64 and arm64.
-
-### slim-base
-
-Based on `java`, installs liblzo2 and grpc_health_probe.
-
-Used as the base image for [deephaven-core's](https://github.com/deephaven/deephaven-core) `ghcr.io/deephaven/server-slim` image.
-
-Produced for platforms amd64 and arm64.
-
-### server-base
-
-Based on `slim-base`, installs python 3.7 runtime libraries and Deephaven python requirements.
-Sets up and defaults to the virtual environment `/opt/deephaven-venv`.
-
-Used as the base image for [deephaven-core's](https://github.com/deephaven/deephaven-core) `ghcr.io/deephaven/server` image.
-
-Produced for platforms amd64 and arm64.
-
-## Web images
-
-### nginx-base
-
-Based on `nginx:1.19`, installs requirements for webdav class 2 support.
-
-Used as the base image for [deephaven-core's](https://github.com/deephaven/deephaven-core) `ghcr.io/deephaven/web` image.
-
-Produced for platforms amd64 and arm64.
+This repository is responsible for producing non-"server" images for use with [deephaven-core](https://github.com/deephaven/deephaven-core). The server-specific `-base` image building process has moved to [deephaven-server-docker](https://github.com/deephaven/deephaven-server-docker).
 
 ## Development images
 
-### python-dev-base
-
-Based on `slim-base`, installs python 3.7 runtime and development libraries.
-Sets up and defaults to the virtual environment `/opt/build-venv`.
-
-Used as the base image for building jpy for [deephaven-core](https://github.com/deephaven/deephaven-core).
-There are nice sympathies when building jpy on a system derived from the runtime image.
-
-Produced for platforms amd64 and arm64.
-
 ### protoc-base
 
 Based on `node:18-bullseye`, installs support for JS, python, and java protoc generation.
@@ -63,50 +16,6 @@ Based on `debian:bullseye`, installs libraries needed to build the Deephaven cpp
 
 Produced (only) for platform amd64.
 
-## Extra server images
-
-The following are extended base runtimes for [deephaven-core](https://github.com/deephaven/deephaven-core).
-
-### nltk-base
-
-Based on `server-base`, installs the [Natural Language Toolkit](https://github.com/nltk/nltk) requirements.
-
-Used as the base image for [deephaven-core's](https://github.com/deephaven/deephaven-core) `ghcr.io/deephaven/server-nltk` image.
-
-Produced for platforms amd64 and arm64.
-
-### pytorch-base
-
-Based on `server-base`, installs [PyTorch](https://github.com/pytorch/pytorch) requirements.
-
-Used as the base image for [deephaven-core's](https://github.com/deephaven/deephaven-core) `ghcr.io/deephaven/server-pytorch` image.
-
-Produced for platforms amd64 and arm64.
-
-### sklearn-base
-
-Based on `server-base`, installs [scikit-learn](https://github.com/scikit-learn/scikit-learn) requirements.
-
-Used as the base image for [deephaven-core's](https://github.com/deephaven/deephaven-core) `ghcr.io/deephaven/server-sklearn` image.
-
-Produced for platforms amd64 and arm64.
-
-### tensorflow-base
-
-Based on `server-base`, installs [Tensorflow](https://github.com/tensorflow/tensorflow) requirements.
-
-Used as the base image for [deephaven-core's](https://github.com/deephaven/deephaven-core) `ghcr.io/deephaven/server-tensorflow` image.
-
-Produced (only) for platform amd64.
-
-### all-ai-base
-
-Based on `server-base`, installs [Natural Language Toolkit](https://github.com/nltk/nltk), [PyTorch](https://github.com/pytorch/pytorch), [scikit-learn](https://github.com/scikit-learn/scikit-learn), and [Tensorflow](https://github.com/tensorflow/tensorflow) requirements.
-
-Used as the base image for [deephaven-core's](https://github.com/deephaven/deephaven-core) `ghcr.io/deephaven/server-all-ai` image.
-
-Produced (only) for platform amd64.
-
 ## Build
 
 For a default, local-only build on your system's platform, run:

docker-bake.hcl

@@ -1,18 +1,12 @@
 group "default" {
     targets = [
-        "java",
-        "nginx-base",
-        "nginx-noroot-base",
         "protoc-base",
         "cpp-client-base",
     ]
 }
 
 group "release" {
     targets = [
-        "java-release",
-        "nginx-base-release",
-        "nginx-noroot-base-release",
         "protoc-base-release",
         "cpp-client-base-release",
     ]
@@ -40,66 +34,6 @@ variable "BUILD_TYPE" {
     default = "Release"
 }
 
-target "java" {
-    context = "server/"
-    tags = [ "${REPO_PREFIX}java:${TAG}" ]
-    target = "java"
-}
-
-target "slim-base" {
-    context = "server/"
-    tags = [ "${REPO_PREFIX}slim-base:${TAG}" ]
-    target = "slim-base"
-}
-
-target "server-base" {
-    context = "server/"
-    tags = [ "${REPO_PREFIX}server-base:${TAG}" ]
-    target = "server-base"
-}
-
-target "nltk-base" {
-    context = "server/"
-    tags = [ "${REPO_PREFIX}nltk-base:${TAG}" ]
-    target = "nltk-base"
-}
-
-target "pytorch-base" {
-    context = "server/"
-    tags = [ "${REPO_PREFIX}pytorch-base:${TAG}" ]
-    target = "pytorch-base"
-}
-
-target "sklearn-base" {
-    context = "server/"
-    tags = [ "${REPO_PREFIX}sklearn-base:${TAG}" ]
-    target = "sklearn-base"
-}
-
-target "tensorflow-base" {
-    context = "server/"
-    tags = [ "${REPO_PREFIX}tensorflow-base:${TAG}" ]
-    target = "tensorflow-base"
-}
-
-target "all-ai-base" {
-    context = "server/"
-    tags = [ "${REPO_PREFIX}all-ai-base:${TAG}" ]
-    target = "all-ai-base"
-}
-
-target "nginx-base" {
-    context = "web/"
-    tags = [ "${REPO_PREFIX}nginx-base:${TAG}" ]
-    target = "nginx-base"
-}
-
-target "nginx-noroot-base" {
-    context = "web/"
-    tags = [ "${REPO_PREFIX}nginx-noroot-base:${TAG}" ]
-    target = "nginx-noroot-base"
-}
-
 target "protoc-base" {
     context = "proto/"
     contexts = {
@@ -117,76 +51,6 @@ target "cpp-client-base" {
     }
 }
 
-target "java-release" {
-    inherits = [ "java" ]
-    cache-from = [ "type=gha,scope=${CACHE_PREFIX}java" ]
-    cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}java" ]
-    platforms = [ "linux/amd64", "linux/arm64" ]
-}
-
-target "slim-base-release" {
-    inherits = [ "slim-base" ]
-    cache-from = [ "type=gha,scope=${CACHE_PREFIX}slim-base" ]
-    cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}slim-base" ]
-    platforms = [ "linux/amd64", "linux/arm64" ]
-}
-
-target "server-base-release" {
-    inherits = [ "server-base" ]
-    cache-from = [ "type=gha,scope=${CACHE_PREFIX}server-base" ]
-    cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}server-base" ]
-    platforms = [ "linux/amd64", "linux/arm64" ]
-}
-
-target "nltk-base-release" {
-    inherits = [ "nltk-base" ]
-    cache-from = [ "type=gha,scope=${CACHE_PREFIX}nltk-base" ]
-    cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}nltk-base" ]
-    platforms = [ "linux/amd64", "linux/arm64" ]
-}
-
-target "pytorch-base-release" {
-    inherits = [ "pytorch-base" ]
-    cache-from = [ "type=gha,scope=${CACHE_PREFIX}pytorch-base" ]
-    cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}pytorch-base" ]
-    platforms = [ "linux/amd64", "linux/arm64" ]
-}
-
-target "sklearn-base-release" {
-    inherits = [ "sklearn-base" ]
-    cache-from = [ "type=gha,scope=${CACHE_PREFIX}sklearn-base" ]
-    cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}sklearn-base" ]
-    platforms = [ "linux/amd64", "linux/arm64" ]
-}
-
-target "tensorflow-base-release" {
-    inherits = [ "tensorflow-base" ]
-    cache-from = [ "type=gha,scope=${CACHE_PREFIX}tensorflow-base" ]
-    cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}tensorflow-base" ]
-    platforms = [ "linux/amd64" ]
-}
-
-target "all-ai-base-release" {
-    inherits = [ "all-ai-base" ]
-    cache-from = [ "type=gha,scope=${CACHE_PREFIX}all-ai-base" ]
-    cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}all-ai-base" ]
-    platforms = [ "linux/amd64" ]
-}
-
-target "nginx-base-release" {
-    inherits = [ "nginx-base" ]
-    cache-from = [ "type=gha,scope=${CACHE_PREFIX}nginx-base" ]
-    cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}nginx-base" ]
-    platforms = [ "linux/amd64", "linux/arm64" ]
-}
-
-target "nginx-noroot-base-release" {
-    inherits = [ "nginx-noroot-base" ]
-    cache-from = [ "type=gha,scope=${CACHE_PREFIX}nginx-noroot-base" ]
-    cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}nginx-noroot-base" ]
-    platforms = [ "linux/amd64", "linux/arm64" ]
-}
-
 target "protoc-base-release" {
     inherits = [ "protoc-base" ]
     cache-from = [ "type=gha,scope=${CACHE_PREFIX}protoc-base" ]