From a5f71d6d4a85083767ce2339a51444a165eafc68 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Wed, 9 Aug 2023 14:35:23 -0700 Subject: [PATCH] Remove server/ and web/ related blocks --- README.md | 93 +------------- clean.sh | 18 --- docker-bake.hcl | 136 --------------------- pull.sh | 17 --- server/01-java/install.sh | 26 ---- server/02-slim-base/install.sh | 17 --- server/03-python-base/install.sh | 15 --- server/04-server-base/cache-bust.txt | 1 - server/04-server-base/install.sh | 18 --- server/04-server-base/requirements.txt | 8 -- server/05-all-ai-base/install.sh | 10 -- server/05-all-ai-base/requirements.txt | 4 - server/05-nltk-base/install.sh | 10 -- server/05-nltk-base/requirements.txt | 1 - server/05-pytorch-base/install.sh | 10 -- server/05-pytorch-base/requirements.txt | 2 - server/05-sklearn-base/install.sh | 10 -- server/05-sklearn-base/requirements.txt | 1 - server/05-tensorflow-base/install.sh | 10 -- server/05-tensorflow-base/requirements.txt | 2 - server/Dockerfile | 52 -------- web/01-nginx-base/install.sh | 16 --- web/01-nginx-noroot-base/install.sh | 22 ---- web/Dockerfile | 17 --- 24 files changed, 1 insertion(+), 515 deletions(-) delete mode 100755 clean.sh delete mode 100755 pull.sh delete mode 100755 server/01-java/install.sh delete mode 100755 server/02-slim-base/install.sh delete mode 100755 server/03-python-base/install.sh delete mode 100644 server/04-server-base/cache-bust.txt delete mode 100755 server/04-server-base/install.sh delete mode 100644 server/04-server-base/requirements.txt delete mode 100755 server/05-all-ai-base/install.sh delete mode 100644 server/05-all-ai-base/requirements.txt delete mode 100755 server/05-nltk-base/install.sh delete mode 100644 server/05-nltk-base/requirements.txt delete mode 100755 server/05-pytorch-base/install.sh delete mode 100644 server/05-pytorch-base/requirements.txt delete mode 100755 server/05-sklearn-base/install.sh delete mode 100644 server/05-sklearn-base/requirements.txt delete mode 100755 server/05-tensorflow-base/install.sh delete mode 100644 server/05-tensorflow-base/requirements.txt delete mode 100644 server/Dockerfile delete mode 100755 web/01-nginx-base/install.sh delete mode 100755 web/01-nginx-noroot-base/install.sh delete mode 100644 web/Dockerfile diff --git a/README.md b/README.md index 0154165..3f4f560 100644 --- a/README.md +++ b/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: diff --git a/clean.sh b/clean.sh deleted file mode 100755 index 985de94..0000000 --- a/clean.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset - -docker rmi \ - ghcr.io/deephaven/java \ - ghcr.io/deephaven/slim-base \ - ghcr.io/deephaven/python-dev-base \ - ghcr.io/deephaven/server-base \ - ghcr.io/deephaven/nltk-base \ - ghcr.io/deephaven/pytorch-base \ - ghcr.io/deephaven/sklearn-base \ - ghcr.io/deephaven/tensorflow-base \ - ghcr.io/deephaven/nginx-base \ - ghcr.io/deephaven/nginx-noroot-base \ - ghcr.io/deephaven/all-ai-base diff --git a/docker-bake.hcl b/docker-bake.hcl index 3cac0fe..b8628dd 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,8 +1,5 @@ group "default" { targets = [ - "java", - "nginx-base", - "nginx-noroot-base", "protoc-base", "cpp-client-base", ] @@ -10,9 +7,6 @@ group "default" { 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" ] diff --git a/pull.sh b/pull.sh deleted file mode 100755 index c35dee3..0000000 --- a/pull.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset - -docker pull ghcr.io/deephaven/java -docker pull ghcr.io/deephaven/slim-base -docker pull ghcr.io/deephaven/python-dev-base -docker pull ghcr.io/deephaven/server-base -docker pull ghcr.io/deephaven/nltk-base -docker pull ghcr.io/deephaven/pytorch-base -docker pull ghcr.io/deephaven/sklearn-base -docker pull ghcr.io/deephaven/tensorflow-base -docker pull ghcr.io/deephaven/nginx-base -docker pull ghcr.io/deephaven/nginx-noroot-base -docker pull ghcr.io/deephaven/all-ai-base diff --git a/server/01-java/install.sh b/server/01-java/install.sh deleted file mode 100755 index 98e5a1b..0000000 --- a/server/01-java/install.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -if [ -f /etc/dpkg/dpkg.cfg.d/docker ]; then \ - # if this file exists, we're likely in "debian:xxx-slim", and locales are thus being excluded so we need to remove that exclusion (since we want locales) - grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker - sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker - ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker -fi - -apt-get -qq update -apt-get -qq -y --no-install-recommends install \ - curl \ - locales \ - ca-certificates -localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - -apt-get -qq -y --no-install-recommends install \ - openjdk-11-jdk-headless -rm -rf /var/lib/apt/lists/* - -dpkg --list diff --git a/server/02-slim-base/install.sh b/server/02-slim-base/install.sh deleted file mode 100755 index f165045..0000000 --- a/server/02-slim-base/install.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -# liblzo is for Parquet codec support -apt-get -qq update -apt-get -qq -y --no-install-recommends install liblzo2-2 -rm -rf /var/lib/apt/lists/* - -GRPC_HEALTH_PROBE_VERSION=v0.3.1 -curl -L -o /bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-${TARGETARCH} -chmod +x /bin/grpc_health_probe - -dpkg --list diff --git a/server/03-python-base/install.sh b/server/03-python-base/install.sh deleted file mode 100755 index 11ab9d7..0000000 --- a/server/03-python-base/install.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -apt-get -qq update -apt-get -qq -y --no-install-recommends install \ - python3.7 \ - libpython3.7 \ - python3-venv -rm -rf /var/lib/apt/lists/* - -dpkg --list diff --git a/server/04-server-base/cache-bust.txt b/server/04-server-base/cache-bust.txt deleted file mode 100644 index d00491f..0000000 --- a/server/04-server-base/cache-bust.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/server/04-server-base/install.sh b/server/04-server-base/install.sh deleted file mode 100755 index 4bccec0..0000000 --- a/server/04-server-base/install.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" - -python3 -m venv /opt/deephaven-venv -source /opt/deephaven-venv/bin/activate - -# Upgrade pip and setuptools standalone. -# Can replace with venv module option `--upgrade-deps` if newer python3-venv becomes available. -python -m pip install -q --no-cache-dir --upgrade pip setuptools -python -m pip install -q --no-cache-dir --upgrade wheel -python -m pip install -q --no-cache-dir --only-binary=:all: -r "${__dir}/requirements.txt" -python -m pip list diff --git a/server/04-server-base/requirements.txt b/server/04-server-base/requirements.txt deleted file mode 100644 index 82663d4..0000000 --- a/server/04-server-base/requirements.txt +++ /dev/null @@ -1,8 +0,0 @@ -numpy -pandas -numba -pyarrow -deephaven-plugin>=0.4.0 -jedi==0.18.2 -jpy==0.13.0 -java-utilities diff --git a/server/05-all-ai-base/install.sh b/server/05-all-ai-base/install.sh deleted file mode 100755 index e93e1c2..0000000 --- a/server/05-all-ai-base/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -python -m pip install -q --no-cache-dir -r "${__dir}/requirements.txt" -python -m pip list diff --git a/server/05-all-ai-base/requirements.txt b/server/05-all-ai-base/requirements.txt deleted file mode 100644 index fab4329..0000000 --- a/server/05-all-ai-base/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -nltk -tensorflow~=2.7.1 -torch -scikit-learn diff --git a/server/05-nltk-base/install.sh b/server/05-nltk-base/install.sh deleted file mode 100755 index e93e1c2..0000000 --- a/server/05-nltk-base/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -python -m pip install -q --no-cache-dir -r "${__dir}/requirements.txt" -python -m pip list diff --git a/server/05-nltk-base/requirements.txt b/server/05-nltk-base/requirements.txt deleted file mode 100644 index 367f769..0000000 --- a/server/05-nltk-base/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -nltk~=3.6.5 diff --git a/server/05-pytorch-base/install.sh b/server/05-pytorch-base/install.sh deleted file mode 100755 index e93e1c2..0000000 --- a/server/05-pytorch-base/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -python -m pip install -q --no-cache-dir -r "${__dir}/requirements.txt" -python -m pip list diff --git a/server/05-pytorch-base/requirements.txt b/server/05-pytorch-base/requirements.txt deleted file mode 100644 index 3955d2e..0000000 --- a/server/05-pytorch-base/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -torch~=1.10.0 -tensorboard \ No newline at end of file diff --git a/server/05-sklearn-base/install.sh b/server/05-sklearn-base/install.sh deleted file mode 100755 index e93e1c2..0000000 --- a/server/05-sklearn-base/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -python -m pip install -q --no-cache-dir -r "${__dir}/requirements.txt" -python -m pip list diff --git a/server/05-sklearn-base/requirements.txt b/server/05-sklearn-base/requirements.txt deleted file mode 100644 index 621c7b6..0000000 --- a/server/05-sklearn-base/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -scikit-learn~=0.24.2 diff --git a/server/05-tensorflow-base/install.sh b/server/05-tensorflow-base/install.sh deleted file mode 100755 index e93e1c2..0000000 --- a/server/05-tensorflow-base/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -python -m pip install -q --no-cache-dir -r "${__dir}/requirements.txt" -python -m pip list diff --git a/server/05-tensorflow-base/requirements.txt b/server/05-tensorflow-base/requirements.txt deleted file mode 100644 index 744b269..0000000 --- a/server/05-tensorflow-base/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -tensorflow~=2.7.1 -tensorboard \ No newline at end of file diff --git a/server/Dockerfile b/server/Dockerfile deleted file mode 100644 index a5c5aa9..0000000 --- a/server/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# syntax=docker/dockerfile:1.4 - -# ------------------------------------- - -# Using buster to ensure python3.7 is available downstream for python - -FROM debian:buster-slim as java - -ARG TARGETARCH -ARG DEBIAN_FRONTEND="noninteractive" - -RUN --mount=type=bind,source=./01-java,target=./01-java ./01-java/install.sh -ENV LANG='en_US.UTF-8' \ - LANGUAGE='en_US:en' \ - LC_ALL='en_US.UTF-8' \ - JAVA_HOME=/usr/lib/jvm/java-11-openjdk-${TARGETARCH} - -# ------------------------------------- - -FROM java as slim-base -RUN --mount=type=bind,source=./02-slim-base,target=./02-slim-base ./02-slim-base/install.sh - -# ------------------------------------- - -FROM slim-base as python-base-internal -RUN --mount=type=bind,source=./03-python-base,target=./03-python-base ./03-python-base/install.sh - -# ------------------------------------- - -FROM python-base-internal as server-base -RUN --mount=type=bind,source=./04-server-base,target=./04-server-base ./04-server-base/install.sh -ENV VIRTUAL_ENV='/opt/deephaven-venv' \ - PATH="/opt/deephaven-venv/bin:${PATH}" - -# ------------------------------------- - -FROM server-base as nltk-base -RUN --mount=type=bind,source=./05-nltk-base,target=./05-nltk-base ./05-nltk-base/install.sh - -FROM server-base as pytorch-base -RUN --mount=type=bind,source=./05-pytorch-base,target=./05-pytorch-base ./05-pytorch-base/install.sh - -FROM server-base as sklearn-base -RUN --mount=type=bind,source=./05-sklearn-base,target=./05-sklearn-base ./05-sklearn-base/install.sh - -FROM server-base as tensorflow-base -RUN --mount=type=bind,source=./05-tensorflow-base,target=./05-tensorflow-base ./05-tensorflow-base/install.sh - -FROM server-base as all-ai-base -RUN --mount=type=bind,source=./05-all-ai-base,target=./05-all-ai-base ./05-all-ai-base/install.sh - -# ------------------------------------- diff --git a/web/01-nginx-base/install.sh b/web/01-nginx-base/install.sh deleted file mode 100755 index 1702e2c..0000000 --- a/web/01-nginx-base/install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -# these installs are necessary to enable webdav class 2 -# https://github.com/arut/nginx-dav-ext-module -apt-get -qq update -apt-get -qq -y --no-install-recommends install \ - nginx-extras \ - libnginx-mod-http-dav-ext -rm -rf /var/lib/apt/lists/* - -dpkg --list diff --git a/web/01-nginx-noroot-base/install.sh b/web/01-nginx-noroot-base/install.sh deleted file mode 100755 index 153d1b4..0000000 --- a/web/01-nginx-noroot-base/install.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset -set -o xtrace - -# these installs are necessary to enable webdav class 2 -# https://github.com/arut/nginx-dav-ext-module -apt-get -qq update -apt-get -qq -y --no-install-recommends install \ - nginx-extras \ - libnginx-mod-http-dav-ext \ - --option=Dpkg::Options::=--force-confdef -rm -rf /var/lib/apt/lists/* - -# Hm. This probably belongs in deephaven-core somewhere instead of here... used by demo system -mkdir -p /data/notebooks -chown nginx:nginx /data/notebooks -mkdir -p /data/layouts -chown nginx:nginx /data/layouts -chown -R nginx:nginx /var/lib/nginx \ No newline at end of file diff --git a/web/Dockerfile b/web/Dockerfile deleted file mode 100644 index fc231a6..0000000 --- a/web/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -# syntax=docker/dockerfile:1.4 - -# ------------------------------------- - -FROM nginx:1.19 as nginx-base - -ARG DEBIAN_FRONTEND="noninteractive" - -RUN --mount=type=bind,source=./01-nginx-base,target=./01-nginx-base ./01-nginx-base/install.sh - -FROM nginxinc/nginx-unprivileged:1.19.7-amd64 as nginx-noroot-base - -USER 0 -ARG DEBIAN_FRONTEND="noninteractive" -RUN --mount=type=bind,source=./01-nginx-noroot-base,target=./01-nginx-noroot-base ./01-nginx-noroot-base/install.sh -# nginx user gets uid 101, from nginx-unprivileged -USER 101 \ No newline at end of file