migrate some images to mc-fedora-base image
Some checks failed
Build images / build-images-amd64 (push) Failing after 33s
Build images / build-images-arm64 (push) Failing after 44s
Build images / update-images-manifests (push) Has been skipped

This commit is contained in:
Maciej Lebiest 2024-05-03 11:25:31 +02:00
parent a7fc84db9f
commit 6eb7b7a41e
5 changed files with 11 additions and 40 deletions

View file

@ -1,15 +1,9 @@
FROM registry.fedoraproject.org/fedora-minimal FROM fogejo.maciej.cloud/pkg/mc-fedora-base
USER root
ENV HISTSIZE=10000
ENV HISTTIMEFORMAT="%d/%m/%y %T "
ENV HISTFILESIZE=100000
# for helm install script # for helm install script
ENV VERIFY_CHECKSUM="false" ENV VERIFY_CHECKSUM="false"
ENV PKGS_BASE="fzf git python3-pip rclone rsync bash-completion kubernetes-client" ENV PKGS_BASE="git python3-pip rclone rsync kubernetes-client"
ENV PKGS_TEMP="python3-devel gcc wget tar" ENV PKGS_TEMP="python3-devel gcc wget tar"
RUN dnf5 install -y ${PKGS_BASE} ${PKGS_TEMP} && \ RUN dnf5 install -y ${PKGS_BASE} ${PKGS_TEMP} && \

View file

@ -1,13 +1,8 @@
FROM registry.fedoraproject.org/fedora-minimal FROM fogejo.maciej.cloud/pkg/mc-fedora-base
ENV HISTSIZE=10000
ENV HISTTIMEFORMAT="%d/%m/%y %T "
ENV HISTFILESIZE=100000
ENV QT_QPA_PLATFORM=wayland ENV QT_QPA_PLATFORM=wayland
ENV GENERAL_PKGS="\ ENV GENERAL_PKGS="\
bash-completion \
procps \
iproute \ iproute \
fzf \ fzf \
wget \ wget \
@ -27,6 +22,4 @@ RUN dnf5 install -y \
${APPS} \ ${APPS} \
&& dnf5 clean all && dnf5 clean all
RUN echo $'[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash' >> /root/.bashrc
ENTRYPOINT [ "/sbin/init" ] ENTRYPOINT [ "/sbin/init" ]

View file

@ -1,14 +1,10 @@
FROM registry.fedoraproject.org/fedora-minimal FROM fogejo.maciej.cloud/pkg/mc-fedora-base
ENV VIRTUAL_ENV=/venv ENV VIRTUAL_ENV=/venv
ENV PATH=/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV PATH=/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV PKGS_DNF="python nodejs latex xelatex tini" ENV PKGS_DNF="python nodejs latex xelatex tini"
ENV PKGS_DNF_BUILD="cargo python3-devel" ENV PKGS_DNF_BUILD="cargo cmake python3-devel"
ENV HISTSIZE=10000
ENV HISTTIMEFORMAT="%d/%m/%y %T "
ENV HISTFILESIZE=200000
ENV PKGS_PIP="jupyter \ ENV PKGS_PIP="jupyter \
bash_kernel \ bash_kernel \

View file

@ -1,12 +1,6 @@
FROM registry.fedoraproject.org/fedora-minimal FROM fogejo.maciej.cloud/pkg/mc-fedora-base
USER root ENV PKGS_BASE="python3-cryptography"
ENV HISTSIZE=10000
ENV HISTTIMEFORMAT="%d/%m/%y %T "
ENV HISTFILESIZE=100000
ENV PKGS_BASE="fzf bash-completion python3-cryptography"
ENV PKGS_GENERAL="htop \ ENV PKGS_GENERAL="htop \
btop \ btop \
@ -37,17 +31,11 @@ ENV PKGS_NETWORK="bind-utils \
iptraf-ng \ iptraf-ng \
mtr" mtr"
COPY help-toolbox.sh /usr/bin/help-toolbox
RUN dnf5 install -y ${PKGS_BASE} ${PKGS_GENERAL} ${PKGS_PROCESSES} ${PKGS_NETWORK} && \ RUN dnf5 install -y ${PKGS_BASE} ${PKGS_GENERAL} ${PKGS_PROCESSES} ${PKGS_NETWORK} && \
chmod 555 /usr/bin/help-toolbox && \
dnf5 -y autoremove && \ dnf5 -y autoremove && \
dnf5 -y clean all dnf5 -y clean all
COPY help-toolbox.sh /usr/bin/help-toolbox
COPY ./bin /usr/local/bin COPY ./bin /usr/local/bin
RUN chmod 555 /usr/bin/help-toolbox && \
echo $'[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash;\
source /etc/profile.d/bash_completion.sh;\
PS1=\'[system-toolbox \W/]\$ \'\
' >> /root/.bashrc
USER root

View file

@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora-minimal FROM fogejo.maciej.cloud/pkg/mc-fedora-base
RUN dnf5 install -y tor nyx util-linux && \ RUN dnf5 install -y tor nyx util-linux && \
dnf5 clean all dnf5 clean all