mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Gentoo - use ksmanis/stage3 image
Use an alternative image until gentoo/stage3 gets pushed to Docker Hub again.
This commit is contained in:
parent
9a5a318d7a
commit
bd2d410e3c
2 changed files with 5 additions and 9 deletions
10
.kitchen.yml
10
.kitchen.yml
|
@ -82,22 +82,16 @@ platforms:
|
|||
- sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
|
||||
- name: gentoo
|
||||
driver_config:
|
||||
image: gentoo/stage3:latest
|
||||
image: ksmanis/stage3:latest
|
||||
run_command: /sbin/init
|
||||
provision_command:
|
||||
- rc-update add sshd default
|
||||
- emerge --update --deep --with-bdeps=y --newuse --quiet @world
|
||||
- emerge --depclean --quiet
|
||||
- eselect python set python3.8
|
||||
- name: gentoo-systemd
|
||||
driver_config:
|
||||
image: gentoo/stage3:systemd
|
||||
image: ksmanis/stage3:systemd
|
||||
run_command: /lib/systemd/systemd
|
||||
provision_command:
|
||||
- systemctl enable sshd.service
|
||||
- emerge --update --deep --with-bdeps=y --newuse --quiet @world
|
||||
- emerge --depclean --quiet
|
||||
- eselect python set python3.8
|
||||
- name: opensuse-15
|
||||
driver_config:
|
||||
image: opensuse/leap:15.1
|
||||
|
|
|
@ -7083,7 +7083,7 @@ __gentoo_pre_dep() {
|
|||
if [ -n "${EXTRA_PYTHON_TARGET:-}" ]; then
|
||||
if ! emerge --info | sed 's/.*\(PYTHON_TARGETS="[^"]*"\).*/\1/' | grep -q "${EXTRA_PYTHON_TARGET}" ; then
|
||||
echo "PYTHON_TARGETS=\"\${PYTHON_TARGETS} ${EXTRA_PYTHON_TARGET}\"" >> /etc/portage/make.conf
|
||||
emerge --update --deep --with-bdeps=y --newuse --quiet @world
|
||||
emerge --deep --with-bdeps=y --newuse --quiet @world
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
@ -7198,6 +7198,8 @@ install_gentoo_git() {
|
|||
elif [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
|
||||
# Tornado 4.3 ebuild supports only Python 3.6, use Python 3.6 as the default Python 3 interpreter
|
||||
_PYEXE=python3.6
|
||||
else
|
||||
_PYEXE=$(emerge --info | grep -oE 'PYTHON_SINGLE_TARGET="[^"]*"' | sed -e 's/"//g' -e 's/_/./g' | cut -d= -f2)
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue