vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #174 from zdc/T2640-equuleus

Browse Source 
VyOS in Docker: T2640: Fixed builds for equuleus (backported from sagitta)
This commit is contained in:
Christian Poessinger 2021-06-30 21:41:15 +02:00 committed by GitHub
commit d3f3913e18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker-vyos/vyos_install_common.sh
View File

@ -36,7 +36,7 @@ function prepare_apt() {
echo -e "deb ${APT_VYOS_MIRROR}/vyos ${APT_VYOS_BRANCH} main\ndeb ${APT_VYOS_MIRROR}/debian ${APT_VYOS_BRANCH} main\n${APT_ADDITIONAL_REPOS}" > /etc/apt/sources.list.d/vyos.list
fi
if [[ "${RELEASE_TRAIN}" == "equuleus" ]]; then
if [[ "${RELEASE_TRAIN}" == "equuleus" || "${RELEASE_TRAIN}" == "sagitta" ]]; then
echo -e "deb ${APT_VYOS_MIRROR} ${APT_VYOS_BRANCH} main\n${APT_ADDITIONAL_REPOS}" > /etc/apt/sources.list.d/vyos.list
# Add backports repository
echo -e "deb http://deb.debian.org/debian buster-backports main\ndeb http://deb.debian.org/debian buster-backports non-free" >> /etc/apt/sources.list.d/vyos.list
@ -47,7 +47,10 @@ function prepare_apt() {
cat /tmp/*list.chroot >> /etc/apt/sources.list.d/vyos.list
fi
if grep -sq Package /tmp/*.pref.chroot; then
cat /tmp/*pref.chroot >> /etc/apt/preferences.d/10vyos
for pref_file in /tmp/*.pref.chroot; do
cat $pref_file >> /etc/apt/preferences.d/10vyos
echo -e "\n" >> /etc/apt/preferences.d/10vyos
done
fi
# Add GPG keys