diff --git a/cloud-toolbox/Containerfile b/cloud-toolbox/Containerfile index 8a12f96..f671579 100644 --- a/cloud-toolbox/Containerfile +++ b/cloud-toolbox/Containerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora-minimal +FROM registry.fedoraproject.org/fedora-minimal:39 USER root diff --git a/gui-container/Containerfile b/gui-container/Containerfile index 9d77b0a..c885c06 100644 --- a/gui-container/Containerfile +++ b/gui-container/Containerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora-minimal +FROM registry.fedoraproject.org/fedora:39 ENV HISTSIZE=10000 ENV HISTTIMEFORMAT="%d/%m/%y %T " @@ -19,13 +19,16 @@ ENV GENERAL_PKGS="\ ENV APPS="\ chromium \ - firefox" + firefox \ + librewolf" # install dependencies and basic apps -RUN dnf5 install -y \ +RUN dnf install -y 'dnf-command(config-manager)' && \ + dnf config-manager --add-repo https://rpm.librewolf.net/librewolf-repo.repo && \ + dnf install -y \ ${GENERAL_PKGS} \ ${APPS} \ - && dnf5 clean all + && dnf clean all RUN echo $'[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash' >> /root/.bashrc diff --git a/jupyter/Containerfile b/jupyter/Containerfile index ac879fb..5eb13a4 100644 --- a/jupyter/Containerfile +++ b/jupyter/Containerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora-minimal +FROM registry.fedoraproject.org/fedora-minimal:39 ENV VIRTUAL_ENV=/venv ENV PATH=/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin @@ -47,4 +47,4 @@ WORKDIR /jupyter ENTRYPOINT [ "tini" ] -CMD [ "jupyter", "--", "lab", "--allow-root", "--no-browser", "--autoreload" ] +CMD [ "jupyter", "--", "notebook", "--allow-root", "--no-browser", "--autoreload", "--ip", "0.0.0.0" ] diff --git a/snowflake/Containerfile b/snowflake/Containerfile index ad62b2b..914aa78 100644 --- a/snowflake/Containerfile +++ b/snowflake/Containerfile @@ -1,19 +1,21 @@ -FROM registry.fedoraproject.org/fedora-minimal +FROM registry.fedoraproject.org/fedora:39 +RUN useradd -u 1423 -m -s '/bin/bash' -U snowflake ENV TZ=Europe/Warsaw -RUN dnf5 install -y shadow-utils git golang && \ - useradd -u 1423 -m -s '/bin/bash' -U snowflake && \ - ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \ + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \ + dnf clean all && \ + dnf install -y git golang && \ git clone https://git.torproject.org/pluggable-transports/snowflake.git && \ cd snowflake/proxy && \ go build && \ - dnf5 remove -y golang git shadow-utils && \ - dnf5 -y autoremove && \ - dnf5 -y clean all && \ + dnf remove -y golang git && \ + dnf -y autoremove && \ + dnf -y clean all && \ mv /snowflake/proxy/proxy /usr/bin/proxy && \ cd / && \ rm -rf /snowflake /root/* && \ - chown snowflake:snowflake /usr/bin/proxy + chown snowflake.snowflake /usr/bin/proxy USER snowflake