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 928f271acfb..145dbc9615c 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 @@ -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 d33bca9642b..f39c6d310d5 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 @@ -75,32 +75,27 @@ 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 \ - software-properties-common \ swig \ unzip \ wget \ zip \ - zlib1g-dev \ - python3-distutils \ - python-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 && \ +# 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 && \ @@ -151,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}" diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-mkl b/tensorflow_serving/tools/docker/Dockerfile.devel-mkl index 297ad6e5b34..0e3776093b1 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 @@ -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 \ 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 <