Delete Dockerfile.ubuntu (#12888)

The file was solely for Nuphar.
This commit is contained in:
Changming Sun 2022-09-08 10:26:40 -07:00 committed by GitHub
parent a811c7629f
commit ff52d6a6bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 57 deletions

View file

@ -1,14 +0,0 @@
FROM ubuntu:20.04
ARG PYTHON_VERSION=3.8
ADD scripts /tmp/scripts
RUN /tmp/scripts/install_ubuntu.sh -p $PYTHON_VERSION && /tmp/scripts/install_os_deps.sh && /tmp/scripts/install_python_deps.sh -p $PYTHON_VERSION && rm -rf /tmp/scripts
WORKDIR /root
ARG BUILD_UID=1000
ARG BUILD_USER=onnxruntimedev
RUN adduser --gecos 'onnxruntime Build User' --disabled-password $BUILD_USER --uid $BUILD_UID
WORKDIR /home/$BUILD_USER
USER $BUILD_USER

View file

@ -59,35 +59,14 @@ if [ $DEVICE_TYPE = "Normal" ]; then
PACKAGE_LIST="$PACKAGE_LIST libedit-dev libxml2-dev python3-packaging"
fi
if [ "$OS_VERSION" = "18.04" ]; then
PACKAGE_LIST="$PACKAGE_LIST libicu60"
else
PACKAGE_LIST="$PACKAGE_LIST libicu66"
fi
PACKAGE_LIST="$PACKAGE_LIST libicu66"
apt-get install -y --no-install-recommends $PACKAGE_LIST
locale-gen en_US.UTF-8
update-locale LANG=en_US.UTF-8
if [ "$OS_VERSION" = "16.04" ]; then
exit 1
elif [ "$OS_VERSION" = "18.04" ]; then
if [ "$PYTHON_VER" != "3.6" ]; then
add-apt-repository -y ppa:deadsnakes/ppa
apt-get update
apt-get install -y --no-install-recommends \
python${PYTHON_VER} \
python${PYTHON_VER}-dev
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VER} 1
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 2
update-alternatives --set python3 /usr/bin/python${PYTHON_VER}
#TODO: the old one(/usr/bin/pip3) should be uninstalled first. Because the one will be
#put at /usr/local/. Then there will be two pips.
/usr/bin/python${PYTHON_VER} -m pip install --upgrade --force-reinstall pip==19.0.3
fi
else # ubuntu20.04
if [ "$OS_VERSION" = "20.04" ]; then
if [ "$PYTHON_VER" != "3.8" ]; then
add-apt-repository -y ppa:deadsnakes/ppa
apt-get update
@ -101,17 +80,10 @@ else # ubuntu20.04
#put at /usr/local/. Then there will be two pips.
/usr/bin/python${PYTHON_VER} -m pip install --upgrade --force-reinstall pip==19.0.3
fi
else
exit 1
fi
rm -rf /var/lib/apt/lists/*
if [ "$SYS_LONG_BIT" = "64" ]; then
if [ "$DEVICE_TYPE" = "Normal" ]; then
if [ "$OS_VERSION" = "20.04" ]; then
#llvm 9.0 doesn't have a release for 20.04, but the binaries for 18.04 should work well.
OS_VERSION="18.04"
fi
aria2c -q -d /tmp -o llvm.tar.xz http://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-${OS_VERSION}.tar.xz
tar --strip 1 -Jxf /tmp/llvm.tar.xz -C /usr
fi
fi

View file

@ -102,20 +102,16 @@ elif [[ $BUILD_DEVICE = "tensorrt"* ]]; then
$GET_DOCKER_IMAGE_CMD --repository "onnxruntime-$IMAGE" \
--docker-build-args="--build-arg BUILD_USER=onnxruntimedev --build-arg BUILD_UID=$(id -u) --build-arg PYTHON_VERSION=${PYTHON_VER}" \
--dockerfile $DOCKER_FILE --context .
else
elif [[ $BUILD_DEVICE = "openvino"* ]]; then
BUILD_ARGS="--build-arg BUILD_USER=onnxruntimedev --build-arg BUILD_UID=$(id -u) --build-arg PYTHON_VERSION=3.8"
if [ $BUILD_DEVICE = "openvino" ]; then
IMAGE="$BUILD_OS-openvino"
DOCKER_FILE=Dockerfile.ubuntu_openvino
BUILD_ARGS+=" --build-arg OPENVINO_VERSION=${OPENVINO_VERSION}"
else
IMAGE="$BUILD_OS"
DOCKER_FILE=Dockerfile.ubuntu
fi
IMAGE="$BUILD_OS-openvino"
DOCKER_FILE=Dockerfile.ubuntu_openvino
BUILD_ARGS+=" --build-arg OPENVINO_VERSION=${OPENVINO_VERSION}"
$GET_DOCKER_IMAGE_CMD --repository "onnxruntime-$IMAGE" \
--docker-build-args="${BUILD_ARGS}" \
--dockerfile $DOCKER_FILE --context .
else
exit 1
fi
if [[ $NEED_BUILD_SHARED_LIB = true ]]; then