Update default to ROCm 6.1

* Update default to Ubuntu 22.04 and ROCm 5.4
* Drop Ubuntu 18.04 stuffs
* Drop hip-libs and opencl-ml variants
* Change default flavor for xterm

Author: aimoff

.env

@@ -1,6 +1,7 @@
-OS_VARIANT=ubuntu-20.04
-ROCM_VERSION=5.3
-AMDGPU_VERSION=5.3
+OS_VARIANT=ubuntu-22.04
+ROCM_VERSION=6.1
+AMDGPU_VERSION=6.1
 TERM_FLAVOR=-complete-sdk
+XTERM_FLAVOR=-complete
 UID=
 RENDER_GID=109

README.md

@@ -12,10 +12,10 @@ This fork is almost completely re-written as:
 - Use `gpg --dearmor` instead of `apt-key add` for ubuntu-20.04 or later.
 - Add X11 enabled terminal image.
 - Omit CentOS-7 stuff due to its EOL.
-- Ubuntu 18.04 stuffs are still exist, but no longer update.
-- Add many image variants based on latest (5.6) [ROCm Programming Models][].
+- Omit Ubuntu 18.04 stuffs.
+- Add many image variants based on latest (6.1) [ROCm Programming Models][].
 
-[ROCm Programming Models]: https://rocm.docs.amd.com/en/docs-5.6.0/deploy/linux/os-native/package_manager_integration.html#components-of-rocm-programming-models
+[ROCm Programming Models]: https://rocm.docs.amd.com/projects/install-on-linux/en/latest/how-to/native-install/package-manager-integration.html#components-of-rocm-programming-models
 
 ## How to build
 ### Build all images for all OSes

build.sh

@@ -3,17 +3,19 @@
 OS=${OS:-ubuntu}
 OS_VERSION=${OS_VERSION:-22.04}
 OS_VARIANT=${OS_VARIANT:-${OS}-${OS_VERSION}}
-ROCM_VERSION=${ROCM_VERSION:-5.6}
-AMDGPU_VERSION=${AMDGPU_VERSION:-5.6}
+ROCM_VERSION=${ROCM_VERSION:-6.1}
+AMDGPU_VERSION=${AMDGPU_VERSION:-6.1}
 #TERM_FLAVOR=""
 TERM_FLAVOR="-complete-sdk"
+XTERM_FLAVOR="-complete"
 RENDER_GID=$(getent group render | cut --delimiter ':' --fields 3)
 
 cat >.env <<EOF
 OS_VARIANT=${OS_VARIANT}
 ROCM_VERSION=${ROCM_VERSION}
 AMDGPU_VERSION=${AMDGPU_VERSION}
 TERM_FLAVOR=${TERM_FLAVOR}
+XTERM_FLAVOR=${XTERM_FLAVOR}
 UID=${UID:-$(id -u)}
 RENDER_GID=${RENDER_GID}
 EOF
@@ -27,7 +29,7 @@ ${COMPOSE} build base || exit $?
 # docker tag rocm/dev-${OS_VARIANT}:${ROCM_VERSION} rocm/dev-${OS_VARIANT}:latest
 
 # build rocm/dev-${OS_VARIANT}:${ROCM_VERSION}-${FLAVOR}
-FLAVORS="openmp-sdk opencl opencl-sdk hip hip-libs hip-sdk ml ml-sdk complete complete-sdk"
+FLAVORS="openmp-sdk opencl opencl-sdk hip hip-sdk ml ml-sdk complete complete-sdk"
 for flavor in ${FLAVORS}; do
   ${COMPOSE} build ${flavor} || exit $?
   # docker tag rocm/dev-${OS_VARIANT}:${ROCM_VERSION}-${FLAVOR} rocm/dev-${OS_VARIANT}:latest-${FLAVOR}