From 20a74d7b383bd2ac377160f6a1f5143dfd378956 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 12 Dec 2022 15:31:06 +0100
Subject: Make buildable on debian 12

---
 core/modules/docker-ce/module.build       | 6 +++++-
 core/modules/docker-ce/module.conf.debian | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 core/modules/docker-ce/module.conf.debian

(limited to 'core/modules/docker-ce')

diff --git a/core/modules/docker-ce/module.build b/core/modules/docker-ce/module.build
index a7ba4966..6355a6af 100644
--- a/core/modules/docker-ce/module.build
+++ b/core/modules/docker-ce/module.build
@@ -5,9 +5,13 @@ module_init() {
 	declare -a apts
 	[ "$SYS_DISTRIBUTION" = "ubuntu" ] || [ "$SYS_DISTRIBUTION" = "debian" ] || return 0
 	# Forcefully add docker repo
+	local vers="$SYS_VERSION"
+	# XXX HACK - currently 12 is still testing, so we get "n/a"
+	# and then, there is no release for it yet at nvidia. So use debian 11 repo.
+	[ "$vers" = "n/a" ] && vers=11
 	apts=(
 		"https://download.docker.com/linux/${SYS_DISTRIBUTION}/gpg deb [arch=$(dpkg --print-architecture) signed-by=%FILE%] https://download.docker.com/linux/$SYS_DISTRIBUTION $(lsb_release -cs) stable"
-		"https://nvidia.github.io/nvidia-docker/gpgkey https://nvidia.github.io/nvidia-docker/${SYS_DISTRIBUTION}$(lsb_release -rs)/nvidia-docker.list"
+		"https://nvidia.github.io/nvidia-docker/gpgkey https://nvidia.github.io/nvidia-docker/${SYS_DISTRIBUTION}${vers}/nvidia-docker.list"
 	)
 	for i in "${apts[@]}"; do
 		url="${i%% *}"
diff --git a/core/modules/docker-ce/module.conf.debian b/core/modules/docker-ce/module.conf.debian
new file mode 100644
index 00000000..7b71a6d4
--- /dev/null
+++ b/core/modules/docker-ce/module.conf.debian
@@ -0,0 +1,8 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+	containerd.io
+	docker-ce
+	docker-ce-cli
+	nvidia-container-toolkit
+	docker-compose
+"
-- 
cgit v1.2.3-55-g7522