YunoHost/yunohost-ci
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-ci.git synced 2024-09-03 20:05:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

add apt options

Browse source
This commit is contained in:
Kay0u 2020-05-18 17:59:31 +02:00
parent a520ef69ac
commit 2ba6d04079
No known key found for this signature in database
GPG key ID: AAFEEB16CFA2AE2D
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
utils.sh
View file

@ -143,12 +143,12 @@ rebuild_base_containers()
# Add yunohost repo
local CUSTOMDEB="deb http://forge.yunohost.org/debian/ stretch stable"
if [[ "$ynh_version" == "stable" ]] ; then
CUSTOMDEB="$CUSTOMDEB"
elif [[ "$ynh_version" == "testing" ]] ; then
CUSTOMDEB="$CUSTOMDEB testing"
elif [[ "$ynh_version" == "unstable" ]] ; then
CUSTOMDEB="$CUSTOMDEB testing unstable"
fi
CUSTOMDEB="$CUSTOMDEB"
elif [[ "$ynh_version" == "testing" ]] ; then
CUSTOMDEB="$CUSTOMDEB testing"
elif [[ "$ynh_version" == "unstable" ]] ; then
CUSTOMDEB="$CUSTOMDEB testing unstable"
fi
lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "echo \"$CUSTOMDEB\" > /etc/apt/sources.list.d/yunohost.list"
lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "wget -O- https://forge.yunohost.org/yunohost.asc -q | apt-key add -qq - >/dev/null 2>&1"
@ -167,7 +167,7 @@ if ! id avahi > /dev/null 2>&1; then
fi"
# Pre install dependencies
lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "apt-get install --assume-yes $YNH_DEPENDENCIES $BUILD_DEPENDENCIES"
lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt-get --assume-yes -o Dpkg::Options::=\"--force-confold\" install --assume-yes $YNH_DEPENDENCIES $BUILD_DEPENDENCIES"
lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "pip install -U pip pytest pytest-sugar pytest-mock requests-mock mock"