From edb8be4f25f866b1f740cfcdd71b00409e8770c5 Mon Sep 17 00:00:00 2001 From: Marat Radchenko Date: Tue, 17 Oct 2023 19:08:27 +0300 Subject: [PATCH] resolves #296 use Ubuntu 22.04 by default (#334) --- docs/advanced-build-options.adoc | 6 +++--- docs/ue4-docker-build.adoc | 2 +- src/ue4docker/infrastructure/BuildConfiguration.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/advanced-build-options.adoc b/docs/advanced-build-options.adoc index b0f03e7a..26352a0b 100644 --- a/docs/advanced-build-options.adoc +++ b/docs/advanced-build-options.adoc @@ -248,9 +248,9 @@ ue4-docker build RELEASE --cuda [source,shell] ---- -# Uses the CUDA 10.0 base image -ue4-docker build RELEASE --cuda=10.0 +# Uses the CUDA 12.2.0 base image +ue4-docker build RELEASE --cuda=12.2.0 {% endhighlight %} ---- -For a list of supported CUDA versions, see the list of Ubuntu 18.04 image tags for the https://hub.docker.com/r/nvidia/cuda/[nvidia/cuda] base image. +For a list of supported CUDA versions, see the list of Ubuntu 22.04 image tags for the https://hub.docker.com/r/nvidia/cuda/[nvidia/cuda] base image. diff --git a/docs/ue4-docker-build.adoc b/docs/ue4-docker-build.adoc index e0c5a8b5..59fec735 100644 --- a/docs/ue4-docker-build.adoc +++ b/docs/ue4-docker-build.adoc @@ -34,7 +34,7 @@ See the xref:available-container-images.adoc[List of available container images] *-basetag* _basetag_:: Operating system base image tag to use. -For Linux this is the version of Ubuntu (default is ubuntu18.04). +For Linux this is the version of Ubuntu (default is ubuntu22.04). For Windows this is the Windows Server Core base image tag (default is the host OS version) *-branch* _branch_:: diff --git a/src/ue4docker/infrastructure/BuildConfiguration.py b/src/ue4docker/infrastructure/BuildConfiguration.py index e9a6f928..62cc1d59 100644 --- a/src/ue4docker/infrastructure/BuildConfiguration.py +++ b/src/ue4docker/infrastructure/BuildConfiguration.py @@ -18,10 +18,10 @@ } # The default ubuntu base to use -DEFAULT_LINUX_VERSION = "ubuntu18.04" +DEFAULT_LINUX_VERSION = "ubuntu22.04" # The default CUDA version to use when `--cuda` is specified without a value -DEFAULT_CUDA_VERSION = "11.4" +DEFAULT_CUDA_VERSION = "12.2.0" # The default memory limit (in GB) under Windows DEFAULT_MEMORY_LIMIT = 10.0 @@ -206,7 +206,7 @@ def addArguments(parser): parser.add_argument( "-basetag", default=None if platform.system() == "Windows" else DEFAULT_LINUX_VERSION, - help="Operating system base image tag to use. For Linux this is the version of Ubuntu (default is ubuntu18.04). " + help="Operating system base image tag to use. For Linux this is the version of Ubuntu (default is ubuntu22.04). " "For Windows this is the Windows Server Core base image tag (default is the host OS version)", ) parser.add_argument(