Skip to content

Commit

Permalink
[stable-2.15] Install upgraded crun from edge (#81833). (#82343)
Browse files Browse the repository at this point in the history
(cherry picked from commit e78cc1e)
  • Loading branch information
sivel committed Dec 4, 2023
1 parent 24a8d04 commit 3561008
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion test/integration/targets/ansible-test-container/runme.py
Original file line number Diff line number Diff line change
Expand Up @@ -1050,9 +1050,16 @@ def usable(cls) -> bool:
def run(cls) -> None:
"""Run the bootstrapper."""
# The `openssl` package is used to generate hashed passwords.
packages = ['docker', 'podman', 'openssl']
# crun added as podman won't install it as dep if runc is present
# but we don't want runc as it fails
# The edge `crun` package installed below requires ip6tables, and in
# edge, the `iptables` package includes `ip6tables`, but in 3.17 they
# are separate.
packages = ['docker', 'podman', 'openssl', 'crun', 'ip6tables']

run_command('apk', 'add', *packages)
# 3.17 only contains crun 1.7.2, to get at least 1.9.2 to resolve the run/shm issue, install crun from edge
run_command('apk', 'upgrade', '-U', '--repository=http://dl-cdn.alpinelinux.org/alpine/edge/community', 'crun')
run_command('service', 'docker', 'start')
run_command('modprobe', 'tun')

Expand Down

0 comments on commit 3561008

Please sign in to comment.