refs #809 install packages and a pip module, try to invalidate docker cache at a specific point

Dockerfile

@@ -1,7 +1,5 @@
 FROM ubuntu:noble
 
-ARG OPENGNSYS_BRANCH=main
-
 RUN apt-get update && apt-get -y install \
   debootstrap \
   fdisk \
@@ -27,14 +25,19 @@ RUN groupadd opengnsys
 RUN mkdir -p /opt/opengnsys/client /tmp/opengnsys/oglive_builder /var/lib/tftpboot/
 RUN ln -fs /var/lib/tftpboot /opt/opengnsys
 
+ARG OPENGNSYS_BRANCH=main
+
 ## take stuff from the OG repo: a) cloning engine, b) shared stuff and c) gitrelease
 RUN git clone -c http.sslVerify=false --branch ${OPENGNSYS_BRANCH} https://ognproject.evlt.uma.es/gitea/opengnsys/opengnsys.git /tmp/ogrepo && \
+    git --git-dir /tmp/ogrepo/.git rev-parse ${OPENGNSYS_BRANCH} && \
     mv /tmp/ogrepo/client/engine /tmp/ogrepo/client/shared /tmp/opengnsys/ && \
     git --git-dir /tmp/ogrepo/.git log --date format:r%Y%m%d --format=%ad -1 >/tmp/opengnsys/oglive_builder/gitrelease && \
     rm -rf /tmp/ogrepo/
 
 ## if we place the ogagent.deb and the ogbrowser.deb in the cwd, then this 'COPY .' copies them to the image
 COPY . /tmp/opengnsys/oglive_builder/
-RUN cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && echo '' >/etc/schroot/default/nssdatabases && rm -f /etc/schroot/setup.d/*chrootname
+RUN cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
+    echo '' >/etc/schroot/default/nssdatabases && \
+    rm -f /etc/schroot/setup.d/*chrootname
 
 ENTRYPOINT ["/tmp/opengnsys/oglive_builder/mkoglive.py"]

chroot-tasks.py

@@ -102,6 +102,9 @@ def boottoolsSoftwareCompile():
     os.environ['LC_ALL']   = env_lc_all
     os.environ['LANG']     = env_lang
 
+def boottoolsPythonModules():
+    utils.run (['pip3', 'install', 'pyblkid'])
+
 def boottoolsInitrdGenerate (osrelease):
     print ('boottoolsInitrdGenerate', file=sys.stderr)
     for f in glob.glob ('/usr/lib/initramfs-tools/bin/*'):
@@ -139,4 +142,5 @@ if __name__ == '__main__':
 
     boottoolsSoftwareInstall (args.osarch, args.osrelease)
     boottoolsSoftwareCompile()
+    boottoolsPythonModules()
     boottoolsInitrdGenerate (args.osrelease)

mkoglive.cfg

@@ -68,8 +68,6 @@ isolinux_template =
 
 [Packages]
 
-agent = policykit-1 python3 python3-pyqt6 python3-requests python3-six python3-prctl python3-distro libxss1 zenity
-
 basic =
   dialog man-db fbset gdebi-core bash-static busybox-static locales lshw gawk git python3-openssl python3 php-cli dmidecode rpm sqlite3 os-prober moreutils jq
   #console-data  # ogLive anterior a Ubuntu 20.04
@@ -131,3 +129,5 @@ xwindows =
   #xorg-dev xorg lxde    #+300M
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
+
+oggit = python3 python3-git python3-xattr python3-libarchive-c python3-pylibacl