Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fedora: Collection of updates & fixes #108

Merged
merged 5 commits into from
Dec 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/fedora.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
env:
distro: 'fedora'
distro_pretty: 'fedora'
latest_release: '38'
latest_release: '39'
platforms: 'linux/amd64, linux/arm64, linux/ppc64le'
registry: 'quay.io/toolbx-images'

Expand All @@ -36,7 +36,7 @@ jobs:
build-push-images:
strategy:
matrix:
release: ['37', '38', '39', '40']
release: ['38', '39', '40']

runs-on: ubuntu-latest
steps:
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ directly use the commands below:

$ toolbox create --image quay.io/toolbx-images/fedora-toolbox:38
$ toolbox enter fedora-toolbox-38

$ toolbox create --image quay.io/toolbx-images/fedora-toolbox:37
$ toolbox enter fedora-toolbox-37
```

- [AlmaLinux] with [EPEL] enabled by default:
Expand Down
37 changes: 0 additions & 37 deletions fedora/37/Containerfile

This file was deleted.

25 changes: 0 additions & 25 deletions fedora/37/ensure-files

This file was deleted.

48 changes: 0 additions & 48 deletions fedora/37/extra-packages

This file was deleted.

20 changes: 0 additions & 20 deletions fedora/37/missing-docs

This file was deleted.

16 changes: 2 additions & 14 deletions fedora/38/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LABEL com.github.containers.toolbox="true" \
RUN rm /etc/rpm/macros.image-language-conf
RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf

COPY missing-docs extra-packages ensure-files /
COPY missing-docs extra-packages /

RUN dnf -y upgrade && \
dnf -y swap coreutils-single coreutils-full && \
Expand All @@ -22,16 +22,4 @@ RUN dnf -y upgrade && \
dnf -y install $(<extra-packages) && \
dnf clean all

RUN ret_val=0; \
while read file; do \
if ! compgen -G "$file" >/dev/null; then \
echo "$file: No such file or directory" >&2; \
ret_val=1; \
break; \
fi; \
done <ensure-files; \
if [ "$ret_val" -ne 0 ]; then \
false; \
fi

RUN rm /missing-docs /extra-packages /ensure-files
RUN rm /missing-docs /extra-packages
21 changes: 21 additions & 0 deletions fedora/38/ensure-files
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,34 @@
/usr/share/man/man1/cp.1*
/usr/share/man/man1/ls.1*

/usr/share/man/man8/dnf.8*
/usr/share/man/man5/dnf.conf.5*

/usr/share/locale/de/LC_MESSAGES/elfutils.mo
/usr/share/locale/ja/LC_MESSAGES/elfutils.mo

/usr/share/man/man1/gpg2.1*
/usr/share/man/man7/gnupg2.7*

/usr/share/info/nettle.info*

/usr/share/locale/fr/LC_MESSAGES/popt.mo
/usr/share/locale/ja/LC_MESSAGES/popt.mo

/usr/share/man/fr/man1/pstree.1*
/usr/share/man/ko/man1/pstree.1*
/usr/share/man/man1/pstree.1*

/usr/share/info/history.info*

/usr/share/man/fr/man8/rpm.8*
/usr/share/man/ja/man8/rpm.8*
/usr/share/man/man8/rpm.8*

/usr/share/man/fr/man8/useradd.8*
/usr/share/man/ja/man8/useradd.8*
/usr/share/man/man8/useradd.8*

/usr/share/man/man1/cal.1.*
/usr/share/man/man1/getopt.1*
/usr/share/man/man1/hexdump.1*
Expand Down
1 change: 1 addition & 0 deletions fedora/38/extra-packages
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ openssh-clients
passwd
pigz
procps-ng
psmisc
rsync
shadow-utils
sudo
Expand Down
71 changes: 71 additions & 0 deletions fedora/38/missing-docs
Original file line number Diff line number Diff line change
@@ -1,20 +1,91 @@
acl
alternatives
audit-libs
authselect
authselect-libs
bash
ca-certificates
coreutils-common
cracklib
crypto-policies
curl
cyrus-sasl-lib
dnf
dnf-data
elfutils-libelf
expat
file-libs
filesystem
findutils
gawk
glib2
gmp
gnupg2
gnutls
gpgme
grep
gzip
ima-evm-utils
keyutils-libs
krb5-libs
libarchive
libassuan
libblkid
libcap
libcap-ng
libdb
libdnf
libeconf
libevent
libffi
libgcrypt
libgomp
libgpg-error
libidn2
libksba
libmodulemd
libpwquality
librepo
libsemanage
libsigsegv
libsolv
libssh
libtasn1
libtirpc
libunistring
libunistring1.0
libverto
libxcrypt
libxml2
libyaml
lz4-libs
mpfr
ncurses-base
nettle
openldap
openssl
p11-kit
pam
pcre2-syntax
popt
python3
python3-libs
python3-rpm
readline
rpm
rpm-sequoia
sed
setup
shadow-utils
sqlite-libs
sudo
systemd
systemd-libs
tar
tpm2-tss
tzdata
util-linux-core
vim-minimal
yum
zchunk-libs
zlib
16 changes: 2 additions & 14 deletions fedora/39/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LABEL com.github.containers.toolbox="true" \
RUN rm /etc/rpm/macros.image-language-conf
RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf

COPY missing-docs extra-packages ensure-files /
COPY missing-docs extra-packages /

RUN dnf -y upgrade && \
dnf -y swap coreutils-single coreutils-full && \
Expand All @@ -22,16 +22,4 @@ RUN dnf -y upgrade && \
dnf -y install $(<extra-packages) && \
dnf clean all

RUN ret_val=0; \
while read file; do \
if ! compgen -G "$file" >/dev/null; then \
echo "$file: No such file or directory" >&2; \
ret_val=1; \
break; \
fi; \
done <ensure-files; \
if [ "$ret_val" -ne 0 ]; then \
false; \
fi

RUN rm /missing-docs /extra-packages /ensure-files
RUN rm /missing-docs /extra-packages
22 changes: 22 additions & 0 deletions fedora/39/ensure-files
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,32 @@
/usr/share/man/man1/cp.1*
/usr/share/man/man1/ls.1*

/usr/share/man/man8/dnf.8*
/usr/share/man/man5/dnf.conf.5*

/usr/share/locale/de/LC_MESSAGES/elfutils.mo
/usr/share/locale/ja/LC_MESSAGES/elfutils.mo

/usr/share/man/man1/gpg2.1*
/usr/share/man/man7/gnupg2.7*

/usr/share/info/nettle.info*

/usr/share/locale/fr/LC_MESSAGES/popt.mo
/usr/share/locale/ja/LC_MESSAGES/popt.mo

/usr/share/man/fr/man1/pstree.1*
/usr/share/man/ko/man1/pstree.1*
/usr/share/man/man1/pstree.1*

/usr/share/info/history.info*

/usr/share/man/man8/rpm.8*
/usr/share/man/man8/rpm2cpio.8*

/usr/share/man/fr/man8/useradd.8*
/usr/share/man/ja/man8/useradd.8*
/usr/share/man/man8/useradd.8*

/usr/share/man/man1/cal.1.*
/usr/share/man/man1/getopt.1*
Expand Down
1 change: 1 addition & 0 deletions fedora/39/extra-packages
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ openssh-clients
passwd
pigz
procps-ng
psmisc
rsync
shadow-utils
sudo
Expand Down
Loading