mount with :Z, update .env-example, remove poetry, update default remote branches

.env-example

@@ -5,22 +5,25 @@
 # When in doubt, do not override.
 
 # who are you?
-GIT_NAME=Example User
-GIT_EMAIL=username@example.com
-GIT_SIGNING_KEY=
-KERBEROS_USERNAME=username
+# you probably should set these to save typing time
+#KERBEROS_USERNAME=username
+#GIT_NAME=Example User
+#GIT_EMAIL=username@example.com
+# git signing is completely optional and nothing internally checks or enforces it
+#GIT_SIGNING_KEY=
 
 # where do I get and put stuff to build?
-DISCOVERY_CLI_GIT_URL=ssh://username@pkgs.devel.redhat.com/rpms/discovery-cli.git
-DISCOVERY_CLI_GIT_REPO_PATH=/repos/discovery-cli
-DISCOVERY_CLI_GIT_REMOTE_RELEASE_BRANCH_DEFAULT=remotes/origin/discovery-1-rhel-9
-DISCOVERY_CLI_GIT_REMOTE_RELEASE_BRANCH_PREFIX=remotes/origin/discovery-
+# you generally should not need to change any of these
+#DISCOVERY_CLI_GIT_URL=ssh://username@pkgs.devel.redhat.com/rpms/discovery-cli.git
+#DISCOVERY_CLI_GIT_REPO_PATH=/repos/discovery-cli
+#DISCOVERY_CLI_GIT_REMOTE_RELEASE_BRANCH_DEFAULT=remotes/origin/discovery-1-rhel-9
+#DISCOVERY_CLI_GIT_REMOTE_RELEASE_BRANCH_PREFIX=remotes/origin/discovery-
 
-POETRY_CACHE_DIR=/repos/.cache
-
-# if you already trust the git server
-KNOWN_HOSTS=
+# you *probably need* to set this to make git happy
+# try to `ssh pkgs.devel.redhat.com` and grab the value from `grep pkgs.devel.redhat.com ~/.ssh/known_hosts`
+#KNOWN_HOSTS=
 
 # make it noisy!
-SHOW_COMMANDS=1
-VERBOSE_SUBPROCESSES=1
+# completely optional but helpful for debugging and understanding the process
+#SHOW_COMMANDS=1
+#VERBOSE_SUBPROCESSES=1

Containerfile

@@ -3,7 +3,7 @@ FROM fedora:40
 RUN dnf install -y \
     krb5-workstation git man vim which chkconfig java-headless cargo packit \
     python3-pip python3-devel python3-setuptools \
-    python3-poetry python3-rich python3-pyyaml \
+    python3-rich python3-pyyaml \
     && curl -L -o /etc/pki/ca-trust/source/anchors/RH-IT-Root-CA.crt https://certs.corp.redhat.com/certs/2015-IT-Root-CA.pem \
     && curl -L -o /etc/pki/ca-trust/source/anchors/2022-IT-Root-CA.pem https://certs.corp.redhat.com/certs/2022-IT-Root-CA.pem \
     && update-ca-trust \

README.md

@@ -33,7 +33,7 @@ Run it! Remove the `-v` or `--env-file` arguments if you do not wish to use the
 
 ```sh
 podman run \
-    -v "$PWD"/repos:/repos \
+    -v "$PWD"/repos:/repos:Z \
     --rm -it \
     --env-file .env \
     downstream-builder:latest

discobuilder/config.py

@@ -25,7 +25,7 @@
 )
 DISCOVERY_CLI_GIT_REMOTE_RELEASE_BRANCH_DEFAULT = environ.get(
     "DISCOVERY_CLI_GIT_REMOTE_RELEASE_BRANCH_DEFAULT",
-    "remotes/origin/discovery-1-rhel-9",
+    "remotes/origin/discovery-2-rhel-9",
 )
 DISCOVERY_CLI_GIT_REMOTE_RELEASE_BRANCH_PREFIX = environ.get(
     "DISCOVERY_CLI_GIT_REMOTE_RELEASE_BRANCH_PREFIX", "remotes/origin/discovery-"
@@ -47,7 +47,7 @@
 )
 DISCOVERY_INSTALLER_GIT_REMOTE_RELEASE_BRANCH_DEFAULT = environ.get(
     "DISCOVERY_INSTALLER_GIT_REMOTE_RELEASE_BRANCH_DEFAULT",
-    "remotes/origin/discovery-1-rhel-9",
+    "remotes/origin/discovery-2-rhel-9",
 )
 DISCOVERY_INSTALLER_GIT_REMOTE_RELEASE_BRANCH_PREFIX = environ.get(
     "DISCOVERY_INSTALLER_GIT_REMOTE_RELEASE_BRANCH_PREFIX", "remotes/origin/discovery-"

scripts/helper.sh

@@ -8,7 +8,6 @@ export DISCOVERY_CLI_GIT_URL
 export DISCOVERY_CLI_GIT_REPO_PATH
 export DISCOVERY_INSTALLER_GIT_URL
 export DISCOVERY_INSTALLER_GIT_REPO_PATH
-export POETRY_CACHE_DIR
 export VERBOSE_SUBPROCESSES
 
 mkdir -p ~/.ssh