saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Gentoo - use ksmanis/stage3 image

Browse source 
Use an alternative image until gentoo/stage3 gets pushed to Docker Hub again.
This commit is contained in:
Ivo Jánský 2020-12-19 08:43:42 +01:00 • committed by Pedro Algarvio
parent 9a5a318d7a
commit bd2d410e3c
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.kitchen.yml
View file

@ -82,22 +82,16 @@ platforms:
- sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config
- name: gentoo - name: gentoo
driver_config: driver_config:
image: gentoo/stage3:latest image: ksmanis/stage3:latest
run_command: /sbin/init run_command: /sbin/init
provision_command: provision_command:
- rc-update add sshd default - 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 - name: gentoo-systemd
driver_config: driver_config:
image: gentoo/stage3:systemd image: ksmanis/stage3:systemd
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
provision_command: provision_command:
- systemctl enable sshd.service - systemctl enable sshd.service
- emerge --update --deep --with-bdeps=y --newuse --quiet @world
- emerge --depclean --quiet
- eselect python set python3.8
- name: opensuse-15 - name: opensuse-15
driver_config: driver_config:
image: opensuse/leap:15.1 image: opensuse/leap:15.1

4
bootstrap-salt.sh
View file

@ -7083,7 +7083,7 @@ __gentoo_pre_dep() {
if [ -n "${EXTRA_PYTHON_TARGET:-}" ]; then if [ -n "${EXTRA_PYTHON_TARGET:-}" ]; then
if ! emerge --info | sed 's/.*\(PYTHON_TARGETS="[^"]*"\).*/\1/' | grep -q "${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 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
fi fi
} }
@ -7198,6 +7198,8 @@ install_gentoo_git() {
elif [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then 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 # Tornado 4.3 ebuild supports only Python 3.6, use Python 3.6 as the default Python 3 interpreter
_PYEXE=python3.6 _PYEXE=python3.6
else
_PYEXE=$(emerge --info | grep -oE 'PYTHON_SINGLE_TARGET="[^"]*"' | sed -e 's/"//g' -e 's/_/./g' | cut -d= -f2)
fi fi
fi fi