Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sketch out changes necessary for python 3.8 base image #84

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Sketch out changes necessary for python 3.8 base image #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions contexts/server-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN \
locales \
fontconfig \
; \
apt-get -qq -y install software-properties-common; \
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \
locale-gen en_US.UTF-8
ENV \
Expand All @@ -54,6 +55,7 @@ RUN \
--mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
--mount=type=cache,target=/var/lib/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
set -eux; \
add-apt-repository ppa:deadsnakes/ppa; \
apt-get -qq update; \
apt-get -qq -y --no-install-recommends install \
libpython${PYTHON_VERSION} \
Expand Down Expand Up @@ -87,13 +89,12 @@ ARG REQUIREMENTS_TYPE
RUN \
--mount=type=bind,source=requirements.txt,target=requirements.txt \
--mount=type=bind,source=type/${REQUIREMENTS_TYPE}/requirements.txt,target=requirements-2.txt \
--mount=type=bind,from=turbodbc-wheel,source=/wheels,target=/wheels \
--mount=type=cache,target=/root/.cache/pip,sharing=locked \
set -eux; \
mkdir -p /opt/deephaven; \
python${PYTHON_VERSION} -m venv /opt/deephaven/venv; \
/opt/deephaven/venv/bin/pip install --upgrade pip setuptools; \
/opt/deephaven/venv/bin/pip install --only-binary=:all: --find-links /wheels -r requirements.txt -r requirements-2.txt
/opt/deephaven/venv/bin/pip install --only-binary=:all: -r requirements.txt -r requirements-2.txt
ENV \
VIRTUAL_ENV="/opt/deephaven/venv" \
PATH="/opt/deephaven/venv/bin:${PATH}"
Expand Down
6 changes: 3 additions & 3 deletions contexts/server-base/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ java-utilities
jedi==0.18.2

# optional adbc feature
adbc-driver-manager
adbc-driver-postgresql
#adbc-driver-manager
#adbc-driver-postgresql

# optional turbodbc feature
# We are adding the arrow/numpy extra requirements to make sure pip installs compatible versions
turbodbc[arrow,numpy]==4.8.0
#turbodbc[arrow,numpy]==4.8.0

# optional connectorx feature for x86_64 arch only, no Linux/arm64 wheel yet
connectorx; platform.machine == 'x86_64'
8 changes: 4 additions & 4 deletions server-base.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ variable "OPENJDK_VERSION" {
}

variable "PYTHON_VERSION" {
default = "3.10"
default = "3.8"
}

variable "UBUNTU_VERSION" {
Expand Down Expand Up @@ -135,9 +135,9 @@ target "server-base-tensorflow" {

target "server-base-context" {
context = "contexts/server-base/"
contexts = {
turbodbc-wheel = "target:turbodbc-wheel"
}
// contexts = {
// turbodbc-wheel = "target:turbodbc-wheel"
// }
args = {
OPENJDK_VERSION = OPENJDK_VERSION
PYTHON_VERSION = PYTHON_VERSION
Expand Down
Loading