From 01d30491ac280c56936e586b3d98467522edd7b8 Mon Sep 17 00:00:00 2001
From: Liliesh <liliesh@proton.me>
Date: Thu, 18 Apr 2024 20:23:26 +0200
Subject: [PATCH] Stuff

---
 Dockerfile          |  2 +-
 Makefile            | 24 ++++++++++++++----------
 packager/Dockerfile |  8 ++++++++
 3 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 packager/Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 3df4cf3..60b6bae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,6 @@ RUN dnf install -y dpkg
 RUN dnf install -y rust cargo
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
-ENV PATH="$HOME/.cargo/bin:$PATH"
+ENV PATH="/root/.cargo/bin:$PATH"
 
 CMD [ "/bin/bash" ]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 270dbec..23b5dee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,19 @@
+BUILD_TAG ?= latest
+
+
 build: build-latest build-version
+publish: publish-generic publish-packager
+
+build-generic:
+	podman build -t liliesh/franky:$(BUILD_TAG) .
+
+build-packager:
+	podman build -t liliesh/franky-packager:$(BUILD_TAG) packager/.
 
-build-latest:
-	podman build -t liliesh/franky:latest .
-	
 
-build-version:
-	podman build -t liliesh/franky:9.3 .
-	
 publish: publish-latest publish-version
-publish-latest:
-	podman push localhost/liliesh/franky:latest registry.satecloud.com/liliesh/franky:latest
+publish-generic:
+	podman push localhost/liliesh/franky:$(BUILD_TAG) registry.satecloud.com/liliesh/franky:$(BUILD_TAG)
 
-publish-version:
-	podman push localhost/liliesh/franky:9.3 registry.satecloud.com/liliesh/franky:9.3
\ No newline at end of file
+publish-packager:
+	podman push localhost/liliesh/franky-packager:$(BUILD_TAG) registry.satecloud.com/liliesh/franky-packager:$(BUILD_TAG)
diff --git a/packager/Dockerfile b/packager/Dockerfile
new file mode 100644
index 0000000..8e0dc80
--- /dev/null
+++ b/packager/Dockerfile
@@ -0,0 +1,8 @@
+FROM rockylinux:9.3
+
+# Install base
+RUN dnf install -y rpmdevtools rpmlint epel-release
+RUN dnf group install -y "Development Tools"
+RUN dnf install -y dpkg
+
+CMD [ "/bin/bash" ]
\ No newline at end of file