From fd35db822b0a1a068aa4e4a686e8fafe0ef35b15 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 21 Mar 2019 17:53:28 +0100 Subject: [PATCH 01/10] Clean up the fallout from the Fedora 30 branching snafu This reverts commit 62506d9f5818819e6d9678b746ca9915d1f1c4b8 https://pagure.io/releng/issue/8210 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 43fdf5b..1be82b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM registry.fedoraproject.org/fedora:31 +FROM registry.fedoraproject.org/fedora:30 -ENV NAME=fedora-toolbox VERSION=31 +ENV NAME=fedora-toolbox VERSION=30 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 44c4b7406bdcd62c4e41fc6ccccc2197c11d9ac7 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 21 Mar 2019 18:02:48 +0100 Subject: [PATCH 02/10] Restore documentation removed from the base Fedora images https://github.com/debarshiray/toolbox/pull/55 --- Dockerfile | 4 ++++ missing-docs | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 missing-docs diff --git a/Dockerfile b/Dockerfile index 1be82b7..73d3648 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,10 @@ COPY README.md / RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf RUN dnf -y swap coreutils-single coreutils-full +COPY missing-docs / +RUN dnf -y reinstall $( Date: Thu, 21 Mar 2019 18:05:59 +0100 Subject: [PATCH 03/10] extra-packages: Add krb5-libs The krb5-libs package was added to the base toolbox images to ensure the presence of the /etc/krb5.conf.d directory with the correct permissions. Currently, the package is already pulled in by various dependencies. Therefore, it doesn't increase the size of the base image, but serves as a safeguard against any inadvertent changes. https://github.com/debarshiray/toolbox/pull/74 --- extra-packages | 1 + 1 file changed, 1 insertion(+) diff --git a/extra-packages b/extra-packages index 09ba35d..791f10f 100644 --- a/extra-packages +++ b/extra-packages @@ -12,6 +12,7 @@ hostname iputils jwhois keyutils +krb5-libs less lsof man-db From 4d25f4d1c06a687dd5ae1ca8246cbd69bcc94ee6 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 21 Mar 2019 18:08:02 +0100 Subject: [PATCH 04/10] Reduce the size by removing temporary files created by DNF For a locally built squashed fedora-toolbox:29 image [1], the size reported by 'podman images' goes from 630 MB to 425 MB. [1] Using: buildah bud --squash ... --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 73d3648..c01ea7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,4 +21,6 @@ COPY extra-packages / RUN dnf -y install $( Date: Thu, 21 Mar 2019 18:09:32 +0100 Subject: [PATCH 05/10] Synchronize with upstream --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8b81a5..a602a07 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This is particularly useful on systems is to discourage installation of software on the host, and instead install software as (or in) containers. -However this project doesn't *require* using an OSTree based system — it +However, this tool doesn't *require* using an OSTree based system — it works equally well if you're running e.g. existing Fedora Workstation or Server, and that's a useful way to incrementally adopt containerization. From d7ff340f2470a879c579b4790e861a87a515d938 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 15 Apr 2019 18:00:39 +0200 Subject: [PATCH 06/10] Add label for tagging, not tied to the fedora-toolbox name Currently the toolbox script identifies toolbox images and containers by checking whether the com.redhat.component label matches "fedora-toolbox". However, as per the Fedora Container Guidelines [1], the com.redhat.com label should match the Red Hat Bugzilla component name where bugs against the image should be reported. This means that images derived from the base fedora-toolbox image would likely end up overwriting it. One option would've been to mandate that all toolbox images have the "fedora-toolbox-" prefix in their names. However, it's better to avoid putting limitations on how images can be named. The "fedora" name wouldn't anyway work for images based on other distributions, and not all images are going to use the Red Hat bugzilla for tracking bugs. It's better to use a tag that's uniquely associated with the toolbox project, and isn't tied to a particular distribution or bug tracker. [1] https://fedoraproject.org/wiki/Container:Guidelines --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c01ea7c..02aaa34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM registry.fedoraproject.org/fedora:30 ENV NAME=fedora-toolbox VERSION=30 -LABEL com.redhat.component="$NAME" \ +LABEL com.github.debarshiray.toolbox="true" \ + com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ usage="This image is meant to be used with the toolbox command" \ From 40c2dc11d6e0f407624014697cebe1c2b45f56d3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 11 Jul 2019 11:10:13 +0000 Subject: [PATCH 07/10] PackageKit-command-not-found --- extra-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/extra-packages b/extra-packages index 791f10f..d48965e 100644 --- a/extra-packages +++ b/extra-packages @@ -20,7 +20,6 @@ man-pages mlocate mtr openssh-clients -PackageKit-command-not-found passwd pigz procps-ng From 7a1bea62c6d2ea6532025a12eadc2254fac37fc4 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 24 Sep 2019 20:10:54 +0200 Subject: [PATCH 08/10] Avoid losing useradd(8) by accident The shadow-utils package was added to the base toolbox images to ensure the presence of the useradd(8) command. Currently the package is already pulled in by various dependencies. Therefore, it doesn't increase the size of the base image, but serves as a safeguard against any inadvertent changes. --- extra-packages | 1 + 1 file changed, 1 insertion(+) diff --git a/extra-packages b/extra-packages index d48965e..c998b3f 100644 --- a/extra-packages +++ b/extra-packages @@ -24,6 +24,7 @@ passwd pigz procps-ng rsync +shadow-utils sudo tcpdump time From 2148ce09508925860a6dea0b73009565005378fb Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 24 Sep 2019 21:05:43 +0200 Subject: [PATCH 09/10] Install only flatpak-spawn, not the rest of flatpak-xdg-utils https://github.com/debarshiray/toolbox/issues/147 --- extra-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra-packages b/extra-packages index c998b3f..b37c946 100644 --- a/extra-packages +++ b/extra-packages @@ -3,7 +3,7 @@ bzip2 diffutils dnf-plugins-core findutils -flatpak-xdg-utils +flatpak-spawn fpaste git gnupg From 41c23bef7659ce5e8798c5f6330e25ba1dc9d5ed Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 10 Oct 2019 16:06:33 +0200 Subject: [PATCH 10/10] Update the label for tagging to reflect the project's new home https://github.com/containers/toolbox/pull/293 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 02aaa34..1074dc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM registry.fedoraproject.org/fedora:30 ENV NAME=fedora-toolbox VERSION=30 -LABEL com.github.debarshiray.toolbox="true" \ +LABEL com.github.containers.toolbox="true" \ + com.github.debarshiray.toolbox="true" \ com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \