Skip to content

[CI/Build] Build on Ubuntu 20.04 instead of 22.04 #6517

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

Merged
simon-mo merged 9 commits into from
Jul 19, 2024
Merged

[CI/Build] Build on Ubuntu 20.04 instead of 22.04 #6517

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1b97d81
Downgrade Dockerfiles to Ubuntu 20.04
tlrmchlsmth Jul 17, 2024
40c1e55
Downgrade python
tlrmchlsmth Jul 17, 2024
5bddc01
use python3 -m pip instead of pip
tlrmchlsmth Jul 18, 2024
40820f1
install pip after python
tlrmchlsmth Jul 18, 2024
7a2d960
Fix a couple of issues
tlrmchlsmth Jul 18, 2024
bb6ec12
comments
tlrmchlsmth Jul 18, 2024
06769cb
Merge branch 'upstream-main' into tms/downgrade_to_ubuntu_20.04
tlrmchlsmth Jul 18, 2024
7207048
Don't wait 1.5 hours for me to let it install libsodium
tlrmchlsmth Jul 18, 2024
44b699d
missed one
tlrmchlsmth Jul 18, 2024
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
10 changes: 6 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
ARG CUDA_VERSION=12.4.1
#################### BASE BUILD IMAGE ####################
# prepare basic build environment
FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu22.04 AS base
FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04 AS base

ARG CUDA_VERSION=12.4.1
ARG PYTHON_VERSION=3
ARG PYTHON_VERSION=3.10

ENV DEBIAN_FRONTEND=noninteractive

Expand All @@ -29,6 +29,8 @@ RUN echo 'tzdata tzdata/Areas select America' | debconf-set-selections \
RUN apt-get update -y \
&& apt-get install -y python3-pip git curl sudo

RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION}

# Workaround for https://github.com/openai/triton/issues/2507 and
# https://github.com/pytorch/pytorch/issues/107960 -- hopefully
# this won't be needed for future versions of this docker image
Expand Down Expand Up @@ -58,7 +60,7 @@ ENV TORCH_CUDA_ARCH_LIST=${torch_cuda_arch_list}
#################### WHEEL BUILD IMAGE ####################
FROM base AS build

ARG PYTHON_VERSION=3
ARG PYTHON_VERSION=3.10

# install build dependencies
COPY requirements-build.txt requirements-build.txt
Expand Down Expand Up @@ -149,7 +151,7 @@ RUN pip --verbose wheel -r requirements-mamba.txt \

#################### vLLM installation IMAGE ####################
# image with vLLM installed
FROM nvidia/cuda:${CUDA_VERSION}-base-ubuntu22.04 AS vllm-base
FROM nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04 AS vllm-base
ARG CUDA_VERSION=12.4.1
WORKDIR /vllm-workspace

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.openvino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The vLLM Dockerfile is used to construct vLLM image that can be directly used
# to run the OpenAI compatible server.

FROM ubuntu:22.04 AS dev
FROM ubuntu:20.04 AS dev

RUN apt-get update -y && \
apt-get install -y python3-pip git
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.xpu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM intel/oneapi-basekit:2024.1.0-devel-ubuntu22.04
FROM intel/oneapi-basekit:2024.1.0-devel-ubuntu20.04

RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/intel-oneapi-archive-keyring.gpg > /dev/null && \
echo "deb [signed-by=/usr/share/keyrings/intel-oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main " | tee /etc/apt/sources.list.d/oneAPI.list && \
Expand Down