From 7f41d0e25d985f985eb0192041ed61dae9574b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ska=C5=82ka?= Date: Mon, 23 Jun 2025 21:21:19 +0200 Subject: [PATCH 1/9] Update Dockerfiles to Ubuntu 22.04 --- tensorflow_serving/tools/docker/Dockerfile | 2 +- tensorflow_serving/tools/docker/Dockerfile.devel | 2 +- tensorflow_serving/tools/docker/Dockerfile.devel-gpu | 2 +- tensorflow_serving/tools/docker/Dockerfile.devel-mkl | 2 +- tensorflow_serving/tools/docker/Dockerfile.gpu | 2 +- tensorflow_serving/tools/docker/Dockerfile.mkl | 2 +- tensorflow_serving/tools/docker/setup.sources.sh | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tensorflow_serving/tools/docker/Dockerfile b/tensorflow_serving/tools/docker/Dockerfile index b426c169140..bdff8e8b750 100644 --- a/tensorflow_serving/tools/docker/Dockerfile +++ b/tensorflow_serving/tools/docker/Dockerfile @@ -16,7 +16,7 @@ ARG TF_SERVING_VERSION=latest ARG TF_SERVING_BUILD_IMAGE=tensorflow/serving:${TF_SERVING_VERSION}-devel FROM ${TF_SERVING_BUILD_IMAGE} as build_image -FROM ubuntu:20.04 +FROM ubuntu:22.04 ARG TF_SERVING_VERSION_GIT_BRANCH=master ARG TF_SERVING_VERSION_GIT_COMMIT=head diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel b/tensorflow_serving/tools/docker/Dockerfile.devel index fe28614b718..191d284272c 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel +++ b/tensorflow_serving/tools/docker/Dockerfile.devel @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM ubuntu:20.04 as base_build +FROM ubuntu:22.04 as base_build ARG TF_SERVING_VERSION_GIT_BRANCH=master ARG TF_SERVING_VERSION_GIT_COMMIT=HEAD diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu index 66032984cb2..5b5ad5204cd 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM nvidia/cuda:12.2.0-base-ubuntu20.04 as base_build +FROM nvidia/cuda:12.2.0-base-ubuntu22.04 as base_build ARG TF_SERVING_VERSION_GIT_BRANCH=master ARG TF_SERVING_VERSION_GIT_COMMIT=HEAD diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-mkl b/tensorflow_serving/tools/docker/Dockerfile.devel-mkl index 598f3d27cee..7d0e0d67550 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-mkl +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-mkl @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM ubuntu:20.04 as base_build +FROM ubuntu:22.04 as base_build ARG TF_SERVING_VERSION_GIT_BRANCH=master ARG TF_SERVING_VERSION_GIT_COMMIT=HEAD diff --git a/tensorflow_serving/tools/docker/Dockerfile.gpu b/tensorflow_serving/tools/docker/Dockerfile.gpu index 80b210d5058..9b738d16d33 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.gpu +++ b/tensorflow_serving/tools/docker/Dockerfile.gpu @@ -16,7 +16,7 @@ ARG TF_SERVING_VERSION=latest ARG TF_SERVING_BUILD_IMAGE=tensorflow/serving:${TF_SERVING_VERSION}-devel-gpu FROM ${TF_SERVING_BUILD_IMAGE} as build_image -FROM nvidia/cuda:12.2.0-base-ubuntu20.04 as base_build +FROM nvidia/cuda:12.2.0-base-ubuntu22.04 as base_build ARG TF_SERVING_VERSION_GIT_BRANCH=master ARG TF_SERVING_VERSION_GIT_COMMIT=HEAD diff --git a/tensorflow_serving/tools/docker/Dockerfile.mkl b/tensorflow_serving/tools/docker/Dockerfile.mkl index 8907183a7ce..2d24ab9ff1b 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.mkl +++ b/tensorflow_serving/tools/docker/Dockerfile.mkl @@ -16,7 +16,7 @@ ARG TF_SERVING_VERSION=latest ARG TF_SERVING_BUILD_IMAGE=tensorflow/serving:${TF_SERVING_VERSION}-devel-mkl FROM ${TF_SERVING_BUILD_IMAGE} as build_image -FROM ubuntu:20.04 +FROM ubuntu:22.04 ARG TF_SERVING_VERSION_GIT_BRANCH=master ARG TF_SERVING_VERSION_GIT_COMMIT=head diff --git a/tensorflow_serving/tools/docker/setup.sources.sh b/tensorflow_serving/tools/docker/setup.sources.sh index df1a6544749..457cb249559 100755 --- a/tensorflow_serving/tools/docker/setup.sources.sh +++ b/tensorflow_serving/tools/docker/setup.sources.sh @@ -41,12 +41,12 @@ cat >/etc/apt/sources.list.d/custom.list < Date: Thu, 18 Sep 2025 13:13:44 +0200 Subject: [PATCH 2/9] Update openjdk and python --- tensorflow_serving/tools/docker/Dockerfile.devel | 7 ++++--- tensorflow_serving/tools/docker/Dockerfile.devel-gpu | 6 +++--- tensorflow_serving/tools/docker/Dockerfile.devel-mkl | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel b/tensorflow_serving/tools/docker/Dockerfile.devel index 2b6ce7f5b8b..145dbc9615c 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel +++ b/tensorflow_serving/tools/docker/Dockerfile.devel @@ -25,6 +25,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ automake \ build-essential \ ca-certificates \ + gnupg \ curl \ git \ gcc-10 \ @@ -35,10 +36,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libtool \ libzmq3-dev \ mlocate \ - openjdk-8-jdk\ - openjdk-8-jre-headless \ + openjdk-11-jdk\ + openjdk-11-jre-headless \ pkg-config \ - python-dev \ + python3-dev \ software-properties-common \ swig \ unzip \ diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu index b6afa874f9a..c127dd31b5a 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu @@ -75,10 +75,10 @@ RUN apt-get install -y --no-install-recommends \ libcurl3-dev \ libzmq3-dev \ mlocate \ - openjdk-8-jdk\ - openjdk-8-jre-headless \ + openjdk-11-jdk\ + openjdk-11-jre-headless \ pkg-config \ - python-dev \ + python3-dev \ software-properties-common \ swig \ unzip \ diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-mkl b/tensorflow_serving/tools/docker/Dockerfile.devel-mkl index 85f02482cba..0e3776093b1 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-mkl +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-mkl @@ -42,8 +42,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libtool \ libzmq3-dev \ mlocate \ - openjdk-8-jdk\ - openjdk-8-jre-headless \ + openjdk-11-jdk\ + openjdk-11-jre-headless \ pkg-config \ software-properties-common \ swig \ From 73b89c92e50c899f985cd924e7ee4a072abf813c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ska=C5=82ka?= <64212291+mikolajskalka@users.noreply.github.com> Date: Tue, 30 Sep 2025 16:24:58 -0400 Subject: [PATCH 3/9] Update python distutils for Dockerfile.devel-gpu --- tensorflow_serving/tools/docker/Dockerfile.devel-gpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu index c127dd31b5a..fd11608c8a3 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu @@ -86,7 +86,7 @@ RUN apt-get install -y --no-install-recommends \ zip \ zlib1g-dev \ python3-distutils \ - python-distutils-extra && \ + python3-distutils-extra && \ find /usr/local/cuda-12.2/lib64/ -type f -name 'lib*_static.a' -not -name 'libcudart_static.a' -delete From 00dfc6400a17cf1014c3c0616f78e16be8999c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ska=C5=82ka?= <64212291+mikolajskalka@users.noreply.github.com> Date: Tue, 30 Sep 2025 16:34:22 -0400 Subject: [PATCH 4/9] Move python distutils installation to the later step --- tensorflow_serving/tools/docker/Dockerfile.devel-gpu | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu index fd11608c8a3..e17dc0a3acd 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu @@ -78,22 +78,19 @@ RUN apt-get install -y --no-install-recommends \ openjdk-11-jdk\ openjdk-11-jre-headless \ pkg-config \ - python3-dev \ software-properties-common \ swig \ unzip \ wget \ zip \ - zlib1g-dev \ - python3-distutils \ - python3-distutils-extra && \ + zlib1g-dev && \ find /usr/local/cuda-12.2/lib64/ -type f -name 'lib*_static.a' -not -name 'libcudart_static.a' -delete # Install python 3.9. RUN add-apt-repository ppa:deadsnakes/ppa && \ apt-get update && apt-get install -y \ - python3.9 python3.9-dev python3-pip python3.9-venv && \ + python3.9 python3.9-dev python3-pip python3.9-venv python3-distutils python3-distutils-extra python3-dev && \ rm -rf /var/lib/apt/lists/* && \ python3.9 -m pip install pip --upgrade && \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 0 From 04b6c3cfb405900c60e13140f3efd0eeba2f9ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ska=C5=82ka?= <64212291+mikolajskalka@users.noreply.github.com> Date: Wed, 1 Oct 2025 23:55:21 -0400 Subject: [PATCH 5/9] Removee software-properties-common --- tensorflow_serving/tools/docker/Dockerfile.devel-gpu | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu index e17dc0a3acd..3690c1c4f52 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu @@ -78,7 +78,6 @@ RUN apt-get install -y --no-install-recommends \ openjdk-11-jdk\ openjdk-11-jre-headless \ pkg-config \ - software-properties-common \ swig \ unzip \ wget \ @@ -88,8 +87,7 @@ RUN apt-get install -y --no-install-recommends \ # Install python 3.9. -RUN add-apt-repository ppa:deadsnakes/ppa && \ - apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y \ python3.9 python3.9-dev python3-pip python3.9-venv python3-distutils python3-distutils-extra python3-dev && \ rm -rf /var/lib/apt/lists/* && \ python3.9 -m pip install pip --upgrade && \ From 1b0c3f302635402631d493cbdd35325b18c58e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ska=C5=82ka?= <64212291+mikolajskalka@users.noreply.github.com> Date: Thu, 2 Oct 2025 09:11:50 -0400 Subject: [PATCH 6/9] Manually add deadsnakes in Dockerfile step --- tensorflow_serving/tools/docker/Dockerfile.devel-gpu | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu index 3690c1c4f52..c6db405cad8 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu @@ -87,7 +87,10 @@ RUN apt-get install -y --no-install-recommends \ # Install python 3.9. -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y --no-install-recommends gpg-agent dirmngr && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F23C5A6CF475977595C89F51BA6932366A755776 && \ + echo "deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main" > /etc/apt/sources.list.d/deadsnakes-ppa.list && \ + apt-get update && apt-get install -y \ python3.9 python3.9-dev python3-pip python3.9-venv python3-distutils python3-distutils-extra python3-dev && \ rm -rf /var/lib/apt/lists/* && \ python3.9 -m pip install pip --upgrade && \ From 4acbca0c1688a95853bf14b0127d9969ab259f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ska=C5=82ka?= <64212291+mikolajskalka@users.noreply.github.com> Date: Thu, 2 Oct 2025 09:58:35 -0400 Subject: [PATCH 7/9] Add universe repository --- tensorflow_serving/tools/docker/Dockerfile.devel-gpu | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu index c6db405cad8..7cf9ce91e80 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu @@ -87,11 +87,12 @@ RUN apt-get install -y --no-install-recommends \ # Install python 3.9. -RUN apt-get update && apt-get install -y --no-install-recommends gpg-agent dirmngr && \ +RUN sed -i 's/$/ universe/' /etc/apt/sources.list && \ + apt-get update && apt-get install -y --no-install-recommends gpg-agent dirmngr && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F23C5A6CF475977595C89F51BA6932366A755776 && \ - echo "deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main" > /etc/apt/sources.list.d/deadsnakes-ppa.list && \ + echo "deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu jammy main" > /etc/apt/sources.list.d/deadsnakes-ppa.list && \ apt-get update && apt-get install -y \ - python3.9 python3.9-dev python3-pip python3.9-venv python3-distutils python3-distutils-extra python3-dev && \ + python3.9 python3.9-dev python3-pip python3.9-venv python3-distutils python3-distutils-extra && \ rm -rf /var/lib/apt/lists/* && \ python3.9 -m pip install pip --upgrade && \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 0 From b571defec3f87c8e753aca4cd90f5ed6896f0730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ska=C5=82ka?= <64212291+mikolajskalka@users.noreply.github.com> Date: Thu, 2 Oct 2025 10:25:03 -0400 Subject: [PATCH 8/9] Make python 3.10 default --- .../tools/docker/Dockerfile.devel-gpu | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu index 7cf9ce91e80..5fa6f4db2d9 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu @@ -86,20 +86,16 @@ RUN apt-get install -y --no-install-recommends \ find /usr/local/cuda-12.2/lib64/ -type f -name 'lib*_static.a' -not -name 'libcudart_static.a' -delete -# Install python 3.9. -RUN sed -i 's/$/ universe/' /etc/apt/sources.list && \ - apt-get update && apt-get install -y --no-install-recommends gpg-agent dirmngr && \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F23C5A6CF475977595C89F51BA6932366A755776 && \ - echo "deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu jammy main" > /etc/apt/sources.list.d/deadsnakes-ppa.list && \ - apt-get update && apt-get install -y \ - python3.9 python3.9-dev python3-pip python3.9-venv python3-distutils python3-distutils-extra && \ +# Install python 3.10. +RUN apt-get update && apt-get install -y --no-install-recommends \ + python3.10 python3-dev python3-pip python3-venv && \ rm -rf /var/lib/apt/lists/* && \ - python3.9 -m pip install pip --upgrade && \ - update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 0 + python3 -m pip install --upgrade pip && \ + update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1 -# Make python3.9 the default python version +# Make python3.10 the default python version # If updating default python version, also update version in the WORKSPACE file. -RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.9 0 +RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.10 1 RUN curl -fSsL -O https://bootstrap.pypa.io/get-pip.py && \ python3 get-pip.py && \ From b8f69f1357b3f3de1a001841ffbc993bd3a1426b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ska=C5=82ka?= <64212291+mikolajskalka@users.noreply.github.com> Date: Thu, 16 Oct 2025 12:27:42 +0000 Subject: [PATCH 9/9] Add path for base build to resolve git issue --- tensorflow_serving/tools/docker/Dockerfile.devel-gpu | 1 + 1 file changed, 1 insertion(+) diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu index 5fa6f4db2d9..f39c6d310d5 100644 --- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu +++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu @@ -146,6 +146,7 @@ ENV TMP="/tmp" WORKDIR /tensorflow-serving FROM base_build as binary_build +ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin # Build, and install TensorFlow Serving ARG TF_SERVING_BUILD_OPTIONS="--config=release" RUN echo "Building with build options: ${TF_SERVING_BUILD_OPTIONS}"