From b622342887699153199db598d3a2aa98a5fd4ff5 Mon Sep 17 00:00:00 2001
From: Maciej Lebiest <szwendacz@maciej.cloud>
Date: Wed, 20 Mar 2024 22:17:33 +0100
Subject: [PATCH] various updates

---
 cloud-toolbox/Containerfile |  2 +-
 gui-container/Containerfile | 11 ++++-------
 jupyter/Containerfile       |  2 +-
 snowflake/Containerfile     | 18 ++++++++----------
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/cloud-toolbox/Containerfile b/cloud-toolbox/Containerfile
index f671579..8a12f96 100644
--- a/cloud-toolbox/Containerfile
+++ b/cloud-toolbox/Containerfile
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora-minimal:39
+FROM registry.fedoraproject.org/fedora-minimal
 
 USER root
 
diff --git a/gui-container/Containerfile b/gui-container/Containerfile
index c885c06..9d77b0a 100644
--- a/gui-container/Containerfile
+++ b/gui-container/Containerfile
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:39
+FROM registry.fedoraproject.org/fedora-minimal
 
 ENV HISTSIZE=10000
 ENV HISTTIMEFORMAT="%d/%m/%y %T "
@@ -19,16 +19,13 @@ ENV GENERAL_PKGS="\
 
 ENV APPS="\
     chromium \
-    firefox \
-    librewolf"
+    firefox"
 
 # install dependencies and basic apps
-RUN dnf install -y 'dnf-command(config-manager)' && \
-    dnf config-manager --add-repo https://rpm.librewolf.net/librewolf-repo.repo && \
-    dnf install -y \
+RUN dnf5 install -y \
     ${GENERAL_PKGS} \
     ${APPS} \
-    && dnf 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
 
diff --git a/jupyter/Containerfile b/jupyter/Containerfile
index 273a7da..ac879fb 100644
--- a/jupyter/Containerfile
+++ b/jupyter/Containerfile
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora-minimal:39
+FROM registry.fedoraproject.org/fedora-minimal
 
 ENV VIRTUAL_ENV=/venv
 ENV PATH=/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/snowflake/Containerfile b/snowflake/Containerfile
index 914aa78..ad62b2b 100644
--- a/snowflake/Containerfile
+++ b/snowflake/Containerfile
@@ -1,21 +1,19 @@
-FROM registry.fedoraproject.org/fedora:39
+FROM registry.fedoraproject.org/fedora-minimal
 
-RUN useradd -u 1423 -m -s '/bin/bash' -U snowflake
 ENV TZ=Europe/Warsaw
-
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
-    dnf clean all && \
-    dnf install -y git golang && \
+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 && \
     git clone https://git.torproject.org/pluggable-transports/snowflake.git && \
     cd snowflake/proxy && \
     go build && \
-    dnf remove -y golang git && \
-    dnf -y autoremove && \
-    dnf -y clean all && \
+    dnf5 remove -y golang git shadow-utils && \
+    dnf5 -y autoremove && \
+    dnf5 -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