Skip to content

Commit

Permalink
++fedora 39
Browse files Browse the repository at this point in the history
  • Loading branch information
jamescalderon committed Jan 1, 2024
1 parent e001961 commit e96876f
Show file tree
Hide file tree
Showing 6 changed files with 213 additions and 34 deletions.
50 changes: 22 additions & 28 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
# Start from the Fedora Toolbox image
FROM quay.io/toolbx-images/fedora-toolbox:38
ENV HOMEBREW_NO_ENV_HINTS=true
FROM registry.fedoraproject.org/fedora:39

# Add user jim
# RUN useradd -m -s /bin/bash jim
# Copy the script into the container and place it in /usr/local/bin
COPY startup.sh /usr/local/bin/startup.sh

# Make the script executable
RUN chmod +x /usr/local/bin/startup.sh

ARG NAME=fedora-toolbox
ARG VERSION=39

RUN rm /etc/rpm/macros.image-language-conf
RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf

COPY missing-docs extra-packages /

# Import Microsoft GPG key and add Visual Studio Code repository
RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc
RUN sh -c 'echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/vscode.repo'

# # Update the system
# RUN dnf -y update && dnf -y upgrade

# # Copy the list of packages into the container
# COPY packages.dnf /tmp/packages.dnf
RUN dnf -y upgrade && \
dnf -y swap coreutils-single coreutils-full && \
dnf -y swap glibc-minimal-langpack glibc-all-langpacks && \
dnf -y reinstall $(<missing-docs) && \
dnf -y install $(<extra-packages) && \
dnf clean all

# # Install packages from the list
# RUN dnf -y install $(cat /tmp/packages.dnf)
RUN rm /missing-docs /extra-packages

# # # Sym-link to host binaries
RUN ln -fs /bin/sh /usr/bin/sh && \
Expand All @@ -26,19 +35,4 @@ RUN ln -fs /bin/sh /usr/bin/sh && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/transactional-update

# # Copy the install script and packages file
# COPY install_homebrew.sh /home/jim/
# COPY packages.brew /home/jim/tmp/

# # Change ownership to jim and make the script executable
# RUN chown -R jim:jim /home/jim/install_homebrew.sh /home/jim/tmp/ && \
# chmod u+x /home/jim/install_homebrew.sh

# # Switch to user jim
# USER jim

# # Add Homebrew to PATH
# ENV PATH="/home/linuxbrew/.linuxbrew/bin:${PATH}"

# # Set the script to run on login
# RUN echo '[[ -f $HOME/install_homebrew.sh ]] && /bin/bash $HOME/install_homebrew.sh' >> /home/jim/.bashrc
CMD [ "/usr/local/bin/startup.sh" ]
45 changes: 45 additions & 0 deletions ensure-files
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/usr/share/man/man1/bash.1*
/usr/share/man/man1/cd.1*
/usr/share/man/man1/export.1*

/usr/share/man/man1/cat.1*
/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*
/usr/share/man/man1/hexdump.1*

/usr/share/man/man1/kill.1*
/usr/share/man/man8/mount.8*

/usr/share/man/fr/man1/xz.1*
/usr/share/man/ko/man1/xz.1*
/usr/share/man/man1/xz.1*
53 changes: 53 additions & 0 deletions extra-packages
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
bash-completion
bc
bzip2
diffutils
dnf-plugins-core
findutils
flatpak-spawn
fpaste
git
gnupg2
gnupg2-smime
gvfs-client
hostname
iproute
iputils
keyutils
krb5-libs
less
lsof
man-db
man-pages
mesa-dri-drivers
mesa-vulkan-drivers
mtr
nano-default-editor
nss-mdns
openssh-clients
passwd
pigz
procps-ng
psmisc
rsync
shadow-utils
sudo
tcpdump
time
traceroute
tree
unzip
util-linux
vte-profile
vulkan-loader
wget
which
whois
words
xorg-x11-xauth
xz
zip
neofetch
stow
code
code-insiders
90 changes: 90 additions & 0 deletions missing-docs
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
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
grep
gzip
ima-evm-utils
keyutils-libs
krb5-libs
libarchive
libassuan
libblkid
libcap
libcap-ng
libcomps
libdb
libdnf
libeconf
libevent
libffi
libgcrypt
libgomp
libgpg-error
libidn2
libksba
libmodulemd
libpwquality
librepo
libsemanage
libsigsegv
libsolv
libssh
libtasn1
libtirpc
libunistring
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
6 changes: 0 additions & 6 deletions packages.dnf

This file was deleted.

3 changes: 3 additions & 0 deletions startup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!bin/bash

echo "Welcome - your home folder is $HOME"

0 comments on commit e96876f

Please sign in to comment.