From 683a6da3ef1b2a3512676ead91dab7255a40a10f Mon Sep 17 00:00:00 2001 From: Sam Stoelinga Date: Thu, 25 Jul 2024 22:50:42 -0700 Subject: [PATCH 1/4] upgrade Dockerfile to ubuntu 22.04 --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7f255e1d6e93e..b4e70c2bc825d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ ARG CUDA_VERSION=12.4.1 #################### BASE BUILD IMAGE #################### # prepare basic build environment -FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04 AS base +FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu22.04 AS base + ARG CUDA_VERSION=12.4.1 ARG PYTHON_VERSION=3.10 ENV DEBIAN_FRONTEND=noninteractive @@ -133,7 +134,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ #################### DEV IMAGE #################### #################### vLLM installation IMAGE #################### # image with vLLM installed -FROM nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04 AS vllm-base +FROM nvidia/cuda:${CUDA_VERSION}-base-ubuntu22.04 AS vllm-base ARG CUDA_VERSION=12.4.1 ARG PYTHON_VERSION=3.10 WORKDIR /vllm-workspace From 3ce98ff403ecc799595e3bbbad25f6aec7542e17 Mon Sep 17 00:00:00 2001 From: Sam Stoelinga Date: Thu, 5 Sep 2024 18:53:25 -0700 Subject: [PATCH 2/4] remove added empty lin --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4e70c2bc825d..d189054b99d16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ ARG CUDA_VERSION=12.4.1 #################### BASE BUILD IMAGE #################### # prepare basic build environment FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu22.04 AS base - ARG CUDA_VERSION=12.4.1 ARG PYTHON_VERSION=3.10 ENV DEBIAN_FRONTEND=noninteractive From 82544cbfd4525ef03a3142156ea184cdc9d25457 Mon Sep 17 00:00:00 2001 From: Sam Stoelinga Date: Thu, 5 Sep 2024 18:58:25 -0700 Subject: [PATCH 3/4] add a github action for testing container build --- .github/workflows/build-container.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/build-container.yml diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml new file mode 100644 index 0000000000000..abae1cb56a2be --- /dev/null +++ b/.github/workflows/build-container.yml @@ -0,0 +1,18 @@ +name: Build Container Image +on: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build and push Docker image + uses: docker/build-push-action@v6 + with: + context: . + file: ./Dockerfile + push: false \ No newline at end of file From 8342c137742a2cabba825aaedcfb05e238d24e13 Mon Sep 17 00:00:00 2001 From: Sam Stoelinga Date: Thu, 5 Sep 2024 21:41:59 -0700 Subject: [PATCH 4/4] optimize disk space on gha --- .github/workflows/build-container.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index abae1cb56a2be..ec990531fa01f 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -1,4 +1,4 @@ -name: Build Container Image +name: Container Image on: pull_request: @@ -6,6 +6,17 @@ jobs: build: runs-on: ubuntu-latest steps: + - name: Maximize build space + uses: easimon/maximize-build-space@master + with: + build-mount-path: /var/lib/docker/ + remove-dotnet: 'true' + remove-android: 'true' + remove-haskell: 'true' + remove-codeql: 'true' + remove-docker-images: 'true' + - name: Restart docker + run: sudo service docker restart - name: Checkout repository uses: actions/checkout@v4 - name: Set up Docker Buildx