mirror of
https://github.com/YunoHost-Apps/gitlab_ynh.git
synced 2024-09-03 18:36:35 +02:00
Actions are different between 11.x and 12.x
This commit is contained in:
parent
c9be3b81f4
commit
7931d88725
5 changed files with 14 additions and 3 deletions
|
@ -184,7 +184,7 @@ ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
|
|||
if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
|
||||
if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
|
||||
then # This command will fail in lxc env
|
||||
ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
||||
package_check_action # defined in upgrade.d/upgrade.last.sh
|
||||
ynh_exec_warn_less dpkg --configure gitlab-ce
|
||||
fi
|
||||
else
|
||||
|
|
|
@ -118,7 +118,7 @@ ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
|
|||
if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
|
||||
if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
|
||||
then # This command will fail in lxc env
|
||||
ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
||||
package_check_action # defined in upgrade.d/upgrade.last.sh
|
||||
ynh_exec_warn_less dpkg --configure gitlab-ce
|
||||
fi
|
||||
else
|
||||
|
|
|
@ -273,7 +273,7 @@ then
|
|||
if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
|
||||
if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
|
||||
then # This command will fail in lxc env
|
||||
ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
||||
package_check_action # defined in upgrade.d/upgrade.X.sh
|
||||
ynh_exec_warn_less dpkg --configure gitlab-ce
|
||||
fi
|
||||
else
|
||||
|
|
|
@ -5,3 +5,9 @@ gitlab_x86_64_source_sha256="1ee3d6e8d2cc198f5466de0884c03f6016299db24859126af9a
|
|||
gitlab_arm_source_sha256="366e12b1f3d3b1694fcb6f13da9de908360ba93f75768d97e8d01e61e8652705"
|
||||
|
||||
gitlab_filename="gitlab-ce-${gitlab_version}.deb"
|
||||
|
||||
# Action to do in case of failure of the package_check
|
||||
package_check_action() {
|
||||
ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
||||
}
|
||||
|
||||
|
|
|
@ -5,3 +5,8 @@ gitlab_x86_64_source_sha256="9e2dcb0e4e3ca3c230d43c6b8580d77c2c716f3c6d1055739f1
|
|||
gitlab_arm_source_sha256="992710fd2c4076961f03633cb6b56331f7ade63a6869c47c2ce28995f8b43893"
|
||||
|
||||
gitlab_filename="gitlab-ce-${gitlab_version}.deb"
|
||||
|
||||
# Action to do in case of failure of the package_check
|
||||
package_check_action() {
|
||||
ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue