Skip to content

Commit

Permalink
python: setup: fedora: Simplify container setup
Browse files Browse the repository at this point in the history
Signed-off-by: Nathan Chancellor <[email protected]>
  • Loading branch information
nathanchance committed Jan 4, 2025
1 parent b23f799 commit 3c0bbe6
Showing 1 changed file with 1 addition and 25 deletions.
26 changes: 1 addition & 25 deletions python/setup/fedora.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,6 @@ def install_packages():
# compression and decompression
'zstd',

# distrobox
'distrobox',

# email
'cyrus-sasl-plain',
'mutt',
Expand Down Expand Up @@ -204,15 +201,7 @@ def install_packages():
'tuxmake',
] # yapf: disable

if lib.setup.is_lxc():
packages += [
'docker-ce',
'docker-ce-cli',
'containerd.io',
'docker-buildx-plugin',
'docker-compose-plugin',
]
else:
if not lib.setup.is_lxc():
packages.append('podman')

# Install Virtualization group on Equinix Metal servers or trusted machines
Expand Down Expand Up @@ -260,15 +249,6 @@ def setup_doas(username):
lib.setup.setup_sudo_symlink()


def setup_docker(username):
if not shutil.which('docker'):
return

lib.utils.run(['groupadd', '-f', 'docker'])
lib.setup.add_user_to_group('docker', username)
lib.setup.systemctl_enable('docker')


def setup_kernel_args():
if lib.setup.get_hostname() != 'honeycomb':
return
Expand Down Expand Up @@ -304,9 +284,6 @@ def setup_pi(username):
def setup_repos():
dnf_add_repo('https://cli.github.com/packages/rpm/gh-cli.repo')

if lib.setup.is_lxc():
dnf_add_repo('https://download.docker.com/linux/fedora/docker-ce.repo')

if machine_is_trusted():
dnf_add_repo('https://pkgs.tailscale.com/stable/fedora/tailscale.repo')

Expand All @@ -330,7 +307,6 @@ def setup_repos():
setup_repos()
install_packages()
setup_doas(user)
setup_docker(user)
setup_kernel_args()
setup_libvirt(user)
setup_mosh()
Expand Down

0 comments on commit 3c0bbe6

Please sign in to comment.