From ddaa29916b150015eed09b19cb4c0d58317412fb Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Thu, 17 Jun 2021 15:43:50 +0200
Subject: [PATCH] add bullseye support

---
 auto_upgrade_container.sh | 13 ++++++++++++-
 rebuild_all.sh            |  7 ++++++-
 run.sh                    |  1 +
 utils.sh                  |  4 ++--
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/auto_upgrade_container.sh b/auto_upgrade_container.sh
index 0224aa0..e28463e 100755
--- a/auto_upgrade_container.sh
+++ b/auto_upgrade_container.sh
@@ -12,4 +12,15 @@ do
 			update_image $debian_version $ynh_version $snapshot
 		done
 	done
-done
\ No newline at end of file
+done
+
+for debian_version in "bullseye"
+do
+	for ynh_version in "unstable"
+	do
+		for snapshot in "before-install" "after-install"
+		do
+			update_image $debian_version $ynh_version $snapshot
+		done
+	done
+done
diff --git a/rebuild_all.sh b/rebuild_all.sh
index cdb1489..bb1bb77 100755
--- a/rebuild_all.sh
+++ b/rebuild_all.sh
@@ -33,4 +33,9 @@ do
 			update_image $debian_version $ynh_version $snapshot
 		done
 	done
-done
\ No newline at end of file
+done
+
+for debian_version in "bullseye"
+do
+	rebuild_base_containers $debian_version "unstable" "amd64"
+done
diff --git a/run.sh b/run.sh
index 4e766e0..16b16f3 100755
--- a/run.sh
+++ b/run.sh
@@ -5,6 +5,7 @@ source $current_dir/variables.sh # Get variables from variables.
 
 case ${2} in
 	prepare_script)
+		echo "CI OPEN: $CUSTOM_ENV_CI_OPEN_MERGE_REQUESTS / CI PIPELINE SOURCE: $CUSTOM_ENV_CI_PIPELINE_SOURCE / REF NAME: $CUSTOM_ENV_CI_COMMIT_REF_NAME / COMMIT: $CUSTOM_ENV_CI_COMMIT_BRANCH, TAG: $CUSTOM_ENV_CI_COMMIT_TAG"
 		;;
 	get_sources)
 		;;
diff --git a/utils.sh b/utils.sh
index 6b010d7..06c1a20 100755
--- a/utils.sh
+++ b/utils.sh
@@ -148,7 +148,7 @@ get_dependencies()
 	SSOWAT_DEPENDENCIES=$(curl https://raw.githubusercontent.com/YunoHost/ssowat/dev/debian/control 2> /dev/null | grep '^Depends:' | sed 's/Depends://' | sed -e "s/,//g" -e "s/[(][^)]*[)]//g" -e "s/ | \S\+//g" | tr "\n" " ")
 	BUILD_DEPENDENCIES="git-buildpackage postfix python-setuptools python3-pip devscripts"
 	PIP_PKG="mock pip pytest pytest-cov pytest-mock pytest-sugar requests-mock tox ansi2html"
-	PIP3_PKG="mock pip pytest pytest-cov pytest-mock pytest-sugar requests-mock tox ansi2html black"
+	PIP3_PKG="mock pip pytest pytest-cov pytest-mock pytest-sugar requests-mock tox ansi2html black jinja2"
 }
 
 rebuild_base_containers()
@@ -172,7 +172,7 @@ rebuild_base_containers()
 	lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "curl -s https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | bash"
 	lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "apt-get install --assume-yes gitlab-runner"
 
-	INSTALL_SCRIPT="https://install.yunohost.org/$debian_version"
+	INSTALL_SCRIPT="https://raw.githubusercontent.com/YunoHost/install_script/$debian_version/install_yunohost"
 
 	# Download the YunoHost install script
 	lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "curl $INSTALL_SCRIPT > install.sh"