container/fedora-toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: container:rawhide
Branches Tags
container:rawhide
container:f38
container:main
container:f37
container:f36
container:f35
container:f34
container:f33
container:f32
container:f31
container:f29
container:f30
container:f28
...
pull from: container:f35
Branches Tags
container:f38
container:main
container:rawhide
container:f37
container:f36
container:f35
container:f34
container:f33
container:f32
container:f31
container:f29
container:f30
container:f28
Sign in to create a new pull request.

6 commits
rawhide ... f35

Author SHA1 Message Date
Jens Petersen
274bdf9053 findutils missing docs 2022-08-09 14:27:08 +08:00
Debarshi Ray
c74e5c7926 Make locate(1) opt-in by default 
Currently, the entry point of a Toolbox container runs updatedb(8) on
start-up, which can be very I/O intensive. This might be a hindrance
when troubleshooting performance problems on a host, or when
re-creating containers somewhat more frequently.

Users can install the mlocate RPM and restart their containers to
enable locate(1).

https://github.com/containers/toolbox/pull/938
 2021-12-01 16:57:19 +01:00
Debarshi Ray
86be929465 Remove misleading and redundant CMD 
There's no need to specify a CMD in a Toolbox image because it's
specified by 'toolbox create', through 'podman create', when creating a
container.

A CMD was specified [1] because the Fedora Container Guidelines
requires it [2]. The idea behind the guidelines is that the right
thing should happen when one runs:
  $ podman run <image>

However, that only makes sense for images targeting single service
containers. Toolbox containers and images are different - they are not
meant to be used like that to run a single one-off service.

Conceptually, 'running' a Toolbox container is expected to provide the
user with a reasonable interactive command line experience. Arguably,
that means offering something like /bin/bash, not /bin/sh.

Also, note that when the CMD was introduced [1], Toolbox containers
were actually created, through 'podman create', with /bin/sh as their
entry points. So, it did make some sense. However, things have changed
since then [3]. The entry point is now 'toolbox init-container'. It's
not possible to mention it in the Toolbox image because the
/usr/bin/toolbox binary isn't present in the image, and it's not meant
to be present.

Therefore, today, /bin/sh is simply not the right fit for a Toolbox
image's CMD. A better option would be /bin/bash.

Note that the fedora base images have their CMD set to /bin/bash, which
is inherited by the fedora-toolbox images.

So, there are two options. Either repeat the same CMD in the
fedora-toolbox images and satisfy the guidelines, or take some
liberties and let the CMD be inherited from the fedora base images.

This commit takes the latter option. People tend to use the
fedora-toolbox images as the starting point for other custom Toolbox
images, sometimes for other operating system distributions. It's
better to keep them minimal to avoid implying extra requirements. In
this case, the CMD is an abstract concept, and the actual entry point
is 'toolbox init-container' as specified by 'toolbox create'.
Specifying /bin/bash might discourage people from creating custom
images that are only meant to have /bin/zsh.

Also, note that the current CMD was actually '/bin/sh -c /bin/sh', not
/bin/sh. Unless a CMD is specified as an array of command line
arguments, it's passed as a single argument to '/bin/sh -c' [4]. So,
this:
  CMD foo bar

... is the same as:
  CMD [ "/bin/sh", "-c", "foo bar" ]

[1] Toolbox commit 5cc2678a3677af44
    5cc2678a36

[2] https://docs.fedoraproject.org/en-US/containers/guidelines/creation/

[3] Toolbox commit 8b84b5e4604921fa
    https://github.com/containers/toolbox/pull/160

[4] https://docs.docker.com/engine/reference/builder/#cmd

https://github.com/containers/toolbox/issues/885
 2021-12-01 15:21:56 +01:00
Debarshi Ray
a69d81176c extra-packages: Avoid losing mount(8) by accident 
The util-linux package was added to ensure the presence of the mount(8)
command. Currently the package is already pulled in by various
dependencies. Therefore, it doesn't increase the size of the image, but
serves as a safeguard against any inadvertent changes.

Note that starting from Fedora 35 onwards, the fedora base images no
longer have mount(8), which increases the importance of this change.

https://github.com/containers/toolbox/issues/929
 2021-11-25 19:50:42 +01:00
Debarshi Ray
f7288e6863 Ensure that coreutils-single is replaced by coreutils-full 
It's true that the fedora base images no longer come with
coreutils-single, but they used to, and the ubi base images still do.
Therefore, it's worth being extra defensive about this.

It's better to make the build system execute one extra redundant
command than expose users to a bug because of a change that snuck in
unnoticed.

This reverts commit a2171d8742.

https://github.com/containers/toolbox/pull/931
 2021-11-25 19:50:04 +01:00
Jens Petersen
c637c4bfa9 fedora:35+ no longer includes acl, openssl, systemd (#1988886) 
and this breaks the koji buildContainer build somehow
 2021-08-12 12:01:58 +08:00
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -13,6 +13,7 @@ LABEL com.github.containers.toolbox="true" \
COPY README.md / COPY README.md /
RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf
RUN dnf -y swap coreutils-single coreutils-full
COPY missing-docs / COPY missing-docs /
RUN dnf -y reinstall $(<missing-docs) RUN dnf -y reinstall $(<missing-docs)
@ -23,5 +24,3 @@ RUN dnf -y install $(<extra-packages)
RUN rm /extra-packages RUN rm /extra-packages
RUN dnf clean all RUN dnf clean all
CMD /bin/sh

2
extra-packages
View file

@ -20,7 +20,6 @@ less
lsof lsof
man-db man-db
man-pages man-pages
mlocate
mtr mtr
nano-default-editor nano-default-editor
nss-mdns nss-mdns
@ -36,6 +35,7 @@ time
traceroute traceroute
tree tree
unzip unzip
util-linux
vte-profile vte-profile
wget wget
which which

4
missing-docs
View file

@ -1,15 +1,13 @@
acl
bash bash
curl curl
findutils
gawk gawk
grep grep
gzip gzip
libcap libcap
openssl
p11-kit p11-kit
pam pam
python3 python3
rpm rpm
sed sed
systemd
tar tar