feat: cleanup + taskfile for local building

Taskfile.yml

@@ -0,0 +1,15 @@
+version: "3"
+
+tasks:
+  build:rpm:
+    desc: Generate RPM specs, definitions and files from the Studio-CLI containerfile.
+    generates:
+      - output/*
+    cmds:
+      - mkdir -p {{.OUT}}
+      - "{{.CONTAINER_MANAGER}} build -v $(realpath {{.OUT}}):/output:Z -f {{.TARGET}} . {{.CLI_ARGS}}"
+    vars:
+      CONTAINER_MANAGER: podman
+      TARGET: rpm.Containerfile
+      OUT: output
+  build:

rpkg.macros

@@ -1,6 +1,6 @@
-function studio-cli_version {
+function git_ref {
     if [ "$GITHUB_REF_NAME" = "" ]; then
-        echo "0.1.0+$(git rev-parse --short HEAD)"
+        echo "$(git rev-parse --short HEAD)"
     else
         echo "$GITHUB_REF_NAME" 
     fi

rpm.Containerfile

@@ -1,29 +1,14 @@
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-latest}"
-
-FROM registry.fedoraproject.org/fedora:${FEDORA_MAJOR_VERSION} AS builder
-
-ENV OUTPUT_ROOT=/app/output
-
-WORKDIR /app 
+ARG REGISTRY=registry.fedoraproject.org/fedora
+FROM ${REGISTRY}:${FEDORA_MAJOR_VERSION} AS builder
 
 ADD . /app
-
-RUN dnf install \
-    --disablerepo='*' \
-    --enablerepo='fedora,updates' \
-    --setopt install_weak_deps=0 \
-    --nodocs \
-    --assumeyes \
-    'dnf-command(builddep)' \
-    rpkg \
-    rpm-build && \
-    mkdir -p $OUTPUT_ROOT/{,output,atomic-studio/rpms} && \
-    rpkg spec --outdir  "$OUTPUT_ROOT" && \
-    dnf builddep -y output/studio-cli.spec && \
-    rpkg local --outdir "$OUTPUT_ROOT/output" && \
-    mv ${OUTPUT_ROOT}/output/noarch/* "${OUTPUT_ROOT}/atomic-studio/rpms"
-
-FROM scratch
-
-ENV OUTPUT_ROOT=/app/output
-COPY --from=builder ${OUTPUT_ROOT}/atomic-studio/rpms /rpms
+WORKDIR /app 
+VOLUME ["/output"]
+
+RUN dnf install --disablerepo='*' --enablerepo='fedora,updates' --setopt install_weak_deps=0 --nodocs --assumeyes 'dnf-command(builddep)' rpkg rpm-build
+
+RUN mkdir -p /output/{,atomic-studio/rpms} && \
+    rpkg spec --outdir /output && \
+    dnf builddep -y /output/studio-cli.spec && \
+    rpkg local --outdir /output

studio-cli.spec

@@ -1,20 +1,15 @@
 Name:          studio-cli 
 Vendor:        atomic-studio-org
-Version:       {{{ studio-cli_version }}}
+Version:       0.1.0+{{{ git_ref }}}
 Release:       0%{?dist}
 Summary:       Manager for Atomic Studio
-License:       Apache-2.0
+License:       3.0-BSD
 URL:           https://github.com/%{vendor}/%{name}
-# Detailed information about the source Git repository and the source commit
-# for the created rpm package
 VCS:           {{{ git_dir_vcs }}}
-
-# git_dir_pack macro places the repository content (the source files) into a tarball
-# and returns its filename. The tarball will be used to build the rpm.
 Source:        {{{ git_dir_pack }}}
 
 BuildArch:     noarch 
-Supplements:   podman 
+Supplements:   podman docker
 Requires:      nu
 
 %description
@@ -30,7 +25,8 @@ Manages Atomic Studio installations
 
 %install
 mkdir -p %{buildroot}%{_libexecdir}/studio-cli %{buildroot}/%{_bindir}
-sed -i 's~\.\/libexec~\/usr\/libexec/~' src/%{pname}
+sed -i 's~\.\/libexec~\/usr\/libexec/%{name}~' src/%{pname}
+cat src/%{pname}
 install -D -m 0755 src/%{pname} %{buildroot}%{_bindir}/%{pname}
 cp -r src/libexec/* %{buildroot}%{_libexecdir}/%{name}