From 33df5a4f883d4def58d474dee6a840f5a64b1eb0 Mon Sep 17 00:00:00 2001
From: charliemirabile <46761267+charliemirabile@users.noreply.github.com>
Date: Tue, 16 Sep 2025 13:37:52 -0400
Subject: [PATCH 1/3] orbit: radius: Containerfile: include indentation to
 improve readability

We can just disable the nagging flake8 warning about tabs and use some
within the fstring to make the containerfile more readable.
---
 orbit/radius.py | 80 ++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/orbit/radius.py b/orbit/radius.py
index 3046fc3d..3ece4fe5 100644
--- a/orbit/radius.py
+++ b/orbit/radius.py
@@ -813,38 +813,38 @@ def handle_containerfile(rocket):
 FROM fedora:42
 
 RUN <<DNF
-dnf -y update
-dnf install -y --setopt=install_weak_deps=False \
-git \
-tar \
-make \
-gcc \
-qemu-system-riscv \
-qemu-user-static-riscv \
-binutils-riscv64-linux-gnu \
-gcc-riscv64-linux-gnu \
-bc \
-flex \
-bison \
-openssl-devel \
-elfutils-libelf-devel \
-ncurses-devel \
-dwarves \
-git-email \
-vim \
-nano \
-{nano_default_editor} \
-mutt \
-cpio \
-wget \
-cyrus-sasl-plain \
-gdb \
-diffutils \
-strace \
-man \
-man-pages \
-;
-dnf clean all
+	dnf -y update
+	dnf install -y --setopt=install_weak_deps=False \
+		git \
+		tar \
+		make \
+		gcc \
+		qemu-system-riscv \
+		qemu-user-static-riscv \
+		binutils-riscv64-linux-gnu \
+		gcc-riscv64-linux-gnu \
+		bc \
+		flex \
+		bison \
+		openssl-devel \
+		elfutils-libelf-devel \
+		ncurses-devel \
+		dwarves \
+		git-email \
+		vim \
+		nano \
+		{nano_default_editor} \
+		mutt \
+		cpio \
+		wget \
+		cyrus-sasl-plain \
+		gdb \
+		diffutils \
+		strace \
+		man \
+		man-pages \
+	;
+	dnf clean all
 DNF
 
 RUN useradd {username} -U
@@ -871,20 +871,20 @@ def handle_containerfile(rocket):
 
 RUN cat <<'GITCONFIG' > ~/.gitconfig
 [user]
-name = '{fullname}'
-email = {username}@{hostname}
+	name = '{fullname}'
+	email = {username}@{hostname}
 [sendemail]
-smtpUser = {username}
-smtpPass = {password}
-smtpserver = {hostname}
-smtpserverport = 465
-smtpencryption = ssl
+	smtpUser = {username}
+	smtpPass = {password}
+	smtpserver = {hostname}
+	smtpserverport = 465
+	smtpencryption = ssl
 GITCONFIG
 
 VOLUME /home
 
 ENTRYPOINT ["/usr/bin/bash", "-l", "-i"]
-'''.encode())
+'''.encode())  # NOQA: W191 E101
 
 
 def handle_error(rocket):

From 44e98653a47753e07f2659625fa57e22c7abf3b8 Mon Sep 17 00:00:00 2001
From: charliemirabile <46761267+charliemirabile@users.noreply.github.com>
Date: Tue, 16 Sep 2025 13:26:45 -0400
Subject: [PATCH 2/3] orbit: radius: Containerfile: initialize stored
 credentials for git clone

add options to `~/.gitconfig` to enable stored credentials for the course
website, and prefill `~/.git-credentials` with the username and password
for a seamless experience with git clone.
---
 orbit/radius.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/orbit/radius.py b/orbit/radius.py
index 3ece4fe5..d53fe794 100644
--- a/orbit/radius.py
+++ b/orbit/radius.py
@@ -879,8 +879,15 @@ def handle_containerfile(rocket):
 	smtpserver = {hostname}
 	smtpserverport = 465
 	smtpencryption = ssl
+[credential "https://{hostname}"]
+	helper = store
+	username = {username}
 GITCONFIG
 
+RUN cat <<'GITCREDENTIALS' > ~/.git-credentials
+https://{username}:{password}@{hostname}
+GITCREDENTIALS
+
 VOLUME /home
 
 ENTRYPOINT ["/usr/bin/bash", "-l", "-i"]

From e3732b2ffcd9963126e76371764f48813f2023a1 Mon Sep 17 00:00:00 2001
From: charliemirabile <46761267+charliemirabile@users.noreply.github.com>
Date: Sun, 14 Sep 2025 12:49:56 -0400
Subject: [PATCH 3/3] orbit: radius: Containerfile: replace heredoc with
 standard && chain

We should use `&&` to separate commands in run like we do in other
containerfiles instead of using a heredoc with run.
---
 orbit/radius.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/orbit/radius.py b/orbit/radius.py
index d53fe794..533dbac3 100644
--- a/orbit/radius.py
+++ b/orbit/radius.py
@@ -812,8 +812,7 @@ def handle_containerfile(rocket):
     return rocket.raw_respond(HTTPStatus.OK, rf'''
 FROM fedora:42
 
-RUN <<DNF
-	dnf -y update
+RUN dnf -y update && \
 	dnf install -y --setopt=install_weak_deps=False \
 		git \
 		tar \
@@ -843,9 +842,9 @@ def handle_containerfile(rocket):
 		strace \
 		man \
 		man-pages \
-	;
-	dnf clean all
-DNF
+	&& \
+	dnf clean all && \
+	:
 
 RUN useradd {username} -U
 USER {username}:{username}