Skip to content

Commit

Permalink
all: Bump default container image to Fedora 39 (#1134)
Browse files Browse the repository at this point in the history
Best-effort, search-and-replace. Checked manually using:

    % rg -iC1 'fedora.*38'

Fedora 39 was released 2023-11-07 (about 2 months ago)

imho, 2 months is enough of a grace period. Thoughts?

- Fixes #1119
  • Loading branch information
osalbahr authored Feb 1, 2024
1 parent da65ee2 commit 2f0968d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions distrobox-create
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ container_clone=""
container_generate_entry=1
container_home_prefix=""
container_image=""
container_image_default="registry.fedoraproject.org/fedora-toolbox:38"
container_image_default="registry.fedoraproject.org/fedora-toolbox:39"
container_init_hook=""
container_manager="autodetect"
container_manager_additional_flags=""
Expand Down Expand Up @@ -148,12 +148,12 @@ distrobox version: ${version}
Usage:
distrobox create --image alpine:latest --name test --init-hooks "touch /var/tmp/test1 && touch /var/tmp/test2"
distrobox create --image fedora:38 --name test --additional-flags "--env MY_VAR-value"
distrobox create --image fedora:38 --name test --volume /opt/my-dir:/usr/local/my-dir:rw --additional-flags "--pids-limit -1"
distrobox create --image fedora:39 --name test --additional-flags "--env MY_VAR-value"
distrobox create --image fedora:39 --name test --volume /opt/my-dir:/usr/local/my-dir:rw --additional-flags "--pids-limit -1"
distrobox create -i docker.io/almalinux/8-init --init --name test --pre-init-hooks "dnf config-manager --enable powertools && dnf -y install epel-release"
distrobox create --clone fedora-38 --name fedora-38-copy
distrobox create --clone fedora-39 --name fedora-39-copy
distrobox create --image alpine my-alpine-container
distrobox create --image registry.fedoraproject.org/fedora-toolbox:38 --name fedora-toolbox-38
distrobox create --image registry.fedoraproject.org/fedora-toolbox:39 --name fedora-toolbox-39
distrobox create --pull --image centos:stream9 --home ~/distrobox/centos9
distrobox create --image alpine:latest --name test2 --additional-packages "git tmux vim"
distrobox create --image ubuntu:22.04 --name ubuntu-nvidia --nvidia
Expand Down Expand Up @@ -423,7 +423,7 @@ fi
# Examples:
# alpine -> alpine
# ubuntu:20.04 -> ubuntu-20.04
# registry.fedoraproject.org/fedora-toolbox:38 -> fedora-toolbox-38
# registry.fedoraproject.org/fedora-toolbox:39 -> fedora-toolbox-39
# ghcr.io/void-linux/void-linux:latest-full-x86_64 -> void-linux-latest-full-x86_64
if [ -z "${container_name}" ]; then
container_name="$(basename "${container_image}" | sed -E 's/[:.]/-/g')"
Expand Down
4 changes: 2 additions & 2 deletions distrobox-enter
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fi

# Defaults
container_command=""
container_image_default="registry.fedoraproject.org/fedora-toolbox:38"
container_image_default="registry.fedoraproject.org/fedora-toolbox:39"
container_manager="autodetect"
container_manager_additional_flags=""
container_name=""
Expand Down Expand Up @@ -124,7 +124,7 @@ distrobox version: ${version}
Usage:
distrobox-enter --name fedora-38 -- bash -l
distrobox-enter --name fedora-39 -- bash -l
distrobox-enter my-alpine-container -- sh -l
distrobox-enter --additional-flags "--preserve-fds" --name test -- bash -l
distrobox-enter --additional-flags "--env MY_VAR=value" --name test -- bash -l
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/distrobox-create.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ If you want to use a non-pre-create image, you'll need to add the additional pac
distrobox create -i ubuntu:22.04 --init --additional-packages "systemd libpam-systemd" -n test
distrobox create -i archlinux:latest --init --additional-packages "systemd" -n test
distrobox create -i registry.opensuse.org/opensuse/tumbleweed:latest --init --additional-packages "systemd" -n test
distrobox create -i registry.fedoraproject.org/fedora:38 --init --additional-packages "systemd" -n test
distrobox create -i registry.fedoraproject.org/fedora:39 --init --additional-packages "systemd" -n test

The `--init` flag is useful to create system containers, where the container acts
more similar to a full VM than an application-container.
Expand Down
2 changes: 1 addition & 1 deletion docs/useful_tips.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ distrobox create -i debian:stable --init --additional-packages "systemd libpam-s
distrobox create -i ubuntu:22.04 --init --additional-packages "systemd libpam-systemd" -n test
distrobox create -i archlinux:latest --init --additional-packages "systemd" -n test
distrobox create -i registry.opensuse.org/opensuse/tumbleweed:latest --init --additional-packages "systemd" -n test
distrobox create -i registry.fedoraproject.org/fedora:38 --init --additional-packages "systemd" -n test
distrobox create -i registry.fedoraproject.org/fedora:39 --init --additional-packages "systemd" -n test
```
Note however that in this mode, you'll not be able to access host's processes
Expand Down
2 changes: 1 addition & 1 deletion man/man1/distrobox-create.1
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ distrobox create -i debian:stable --init --additional-packages \[dq]systemd libp
distrobox create -i ubuntu:22.04 --init --additional-packages \[dq]systemd libpam-systemd\[dq] -n test
distrobox create -i archlinux:latest --init --additional-packages \[dq]systemd\[dq] -n test
distrobox create -i registry.opensuse.org/opensuse/tumbleweed:latest --init --additional-packages \[dq]systemd\[dq] -n test
distrobox create -i registry.fedoraproject.org/fedora:38 --init --additional-packages \[dq]systemd\[dq] -n test
distrobox create -i registry.fedoraproject.org/fedora:39 --init --additional-packages \[dq]systemd\[dq] -n test
\f[R]
.fi
.PP
Expand Down
2 changes: 1 addition & 1 deletion man/man1/distrobox.1
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ distrobox create -i debian:stable --init --additional-packages \[dq]systemd libp
distrobox create -i ubuntu:22.04 --init --additional-packages \[dq]systemd libpam-systemd\[dq] -n test
distrobox create -i archlinux:latest --init --additional-packages \[dq]systemd\[dq] -n test
distrobox create -i registry.opensuse.org/opensuse/tumbleweed:latest --init --additional-packages \[dq]systemd\[dq] -n test
distrobox create -i registry.fedoraproject.org/fedora:38 --init --additional-packages \[dq]systemd\[dq] -n test
distrobox create -i registry.fedoraproject.org/fedora:39 --init --additional-packages \[dq]systemd\[dq] -n test
\f[R]
.fi
.PP
Expand Down

0 comments on commit 2f0968d

Please sign in to comment.