From 553dab3fda3b90dacb0173d22914ebc68e655b8a Mon Sep 17 00:00:00 2001
From: bjoernellens1 <64093272+bjoernellens1@users.noreply.github.com>
Date: Thu, 30 Nov 2023 10:04:15 +0100
Subject: [PATCH] update: using normal fedora image now

---
 docker/Dockerfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 484a9da..069879b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -90,24 +90,25 @@ LABEL org.opencontainers.image.source=https://github.com/bjoernellens1/cps_loki
 #############################################
 # OliveTin Build                            #
 #############################################
-FROM registry.fedoraproject.org/fedora-minimal:39 AS olivetin
+FROM registry.fedoraproject.org/fedora:39 AS olivetin
 
 LABEL org.opencontainers.image.source https://ghcr.io/bjoernellens1/cps_bot_mini_ws/olivetin
 LABEL org.opencontainers.image.title=OliveTin
 
 # Making sure there is newest docker version installed
-RUN dnf5 -y install dnf-plugins-core \
-    dnf5 config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo \
-    dnf5 install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+RUN dnf -y install dnf-plugins-core \
+    dnf -y install 'dnf-command(config-manager)' \
+    dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo \
+    dnf -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 
 # Install OliveTin and dependencies
 RUN mkdir -p /config /var/www/olivetin \
-    && dnf5 install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \
+    && dnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \
 		iputils \
 		openssh-clients \
 		shadow-utils \
         OliveTin \
-	&& dnf5 clean all
+	&& dnf clean all
 
 RUN useradd --system --create-home olivetin -u 1000