WIP

.github/workflows/build.yaml

@@ -272,7 +272,7 @@ jobs:
       - name: Make bundle
         run: image/scanner/rhel/create-bundle.sh image/scanner image/scanner/rhel
 
-      - name: Bundle the bundle to preserve permissions # TODO: word this better?
+      - name: Bundle the bundle to preserve permissions # TODO(DO NOT MERGE): word this better?
         run: tar -cvzf bundle.tgz image/scanner/rhel
 
       - uses: actions/upload-artifact@v3
@@ -313,7 +313,6 @@ jobs:
           name: scanner-db-bundle
           path: image/db/rhel
 
-#  build-and-push-main:
   build-images:
     runs-on: ubuntu-latest
     needs:

scripts/ci/postgres.sh

@@ -26,7 +26,7 @@ start_postgres() {
             adduser pg -u 1001 -g 1001 -d /var/lib/postgresql -s /bin/sh
 
             # The PATH is not completely preserved, so set the PATH here to ensure postgres-related commands can be found.
-            runuser -l pg -c "PATH=$PATH _start_postgres"
+            runuser -l pg -c "PATH=$PATH $SCRIPTS_ROOT/scripts/ci/postgres.sh _start_postgres" # TODO(DO NOT MERGE): this is a mess
         else
             die "Please re-run as a non-root user."
         fi